Merge branches 'release' and 'gpe-ack' into release

[linux-2.6-omap-h63xx.git] / include / asm-ppc / mmu_context.h

diff --git a/include/asm-ppc/mmu_context.h b/include/asm-ppc/mmu_context.h
index b2e25d8997bffdce4dc14f635646df600c1fce52..9f097e25b169bbba0940f4745cffdfa544ccfa98 100644 (file)
--- a/include/asm-ppc/mmu_context.h
+++ b/include/asm-ppc/mmu_context.h
@@ -64,11 +64,6 @@ static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
 #define LAST_CONTEXT           255
 #define FIRST_CONTEXT          1
 
-#elif defined(CONFIG_E200) || defined(CONFIG_E500)
-#define NO_CONTEXT             256
-#define LAST_CONTEXT           255
-#define FIRST_CONTEXT          1
-
 #else
 
 /* PPC 6xx, 7xx CPUs */