diff options
| author | Adrian Bunk <bunk@kernel.org> | 2007-08-27 21:29:53 (GMT) |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-17 05:15:04 (GMT) |
| commit | e6b6e3ffb9ee8926f9f2f7dc9147df73e27d5828 (patch) | |
| tree | ecda5a24187801c1ad46e0d9d90a9fc5f547a52b /include/asm-powerpc | |
| parent | 8237bf080e9ef6adc3f2adce26060722685bbb15 (diff) | |
| download | linux-fsl-qoriq-e6b6e3ffb9ee8926f9f2f7dc9147df73e27d5828.tar.xz | |
[POWERPC] Remove APUS support from arch/ppc
Current status of APUS:
- arch/powerpc/: removed in 2.6.23
- arch/ppc/: marked BROKEN since 2 years
This therefore removes the remaining parts of APUS support from
arch/ppc, include/asm-ppc, arch/powerpc and include/asm-powerpc.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/ide.h | 2 | ||||
| -rw-r--r-- | include/asm-powerpc/reg.h | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/asm-powerpc/ide.h b/include/asm-powerpc/ide.h index 0f66f0f..1644e44 100644 --- a/include/asm-powerpc/ide.h +++ b/include/asm-powerpc/ide.h @@ -67,7 +67,7 @@ static __inline__ unsigned long ide_default_io_base(int index) #define ide_init_default_irq(base) ide_default_irq(base) #endif -#if (defined CONFIG_APUS || defined CONFIG_BLK_DEV_MPC8xx_IDE ) +#ifdef CONFIG_BLK_DEV_MPC8xx_IDE #define IDE_ARCH_ACK_INTR 1 #define ide_ack_intr(hwif) (hwif->hw.ack_intr ? hwif->hw.ack_intr(hwif) : 1) #endif diff --git a/include/asm-powerpc/reg.h b/include/asm-powerpc/reg.h index 347de53..e775ff1 100644 --- a/include/asm-powerpc/reg.h +++ b/include/asm-powerpc/reg.h @@ -102,12 +102,8 @@ #else /* 32-bit */ /* Default MSR for kernel mode. */ #ifndef MSR_KERNEL /* reg_booke.h also defines this */ -#ifdef CONFIG_APUS_FAST_EXCEPT -#define MSR_KERNEL (MSR_ME|MSR_IP|MSR_RI|MSR_IR|MSR_DR) -#else #define MSR_KERNEL (MSR_ME|MSR_RI|MSR_IR|MSR_DR) #endif -#endif #define MSR_USER (MSR_KERNEL|MSR_PR|MSR_EE) #endif |