diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
| commit | 8624512aa908741ba2795200133eae0d7f4557ea (patch) | |
| tree | d5d3036fccf2604f4c98dedc11e8adb929d6b52e /include/asm-ppc/processor.h | |
| parent | 7b8f5d6f1d45d9f9de1d26e7d3c32aa5af11b488 (diff) | |
Merge with 2.3.48.
Diffstat (limited to 'include/asm-ppc/processor.h')
| -rw-r--r-- | include/asm-ppc/processor.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index 704bd68ab..5212c5b71 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -692,16 +692,7 @@ void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val); #endif /* ndef ASSEMBLY*/ #ifdef CONFIG_MACH_SPECIFIC -#if defined(CONFIG_PREP) -#define _machine _MACH_prep -#define have_of 0 -#elif defined(CONFIG_CHRP) -#define _machine _MACH_chrp -#define have_of 1 -#elif defined(CONFIG_PMAC) -#define _machine _MACH_Pmac -#define have_of 1 -#elif defined(CONFIG_8xx) +#if defined(CONFIG_8xx) #define _machine _MACH_8xx #define have_of 0 #elif defined(CONFIG_OAK) |