diff options
Diffstat (limited to 'include/asm-x86/ide.h')
-rw-r--r-- | include/asm-x86/ide.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/asm-x86/ide.h b/include/asm-x86/ide.h index c2552d8bebf7..cf9c98e5bdb5 100644 --- a/include/asm-x86/ide.h +++ b/include/asm-x86/ide.h | |||
@@ -20,8 +20,6 @@ | |||
20 | # endif | 20 | # endif |
21 | #endif | 21 | #endif |
22 | 22 | ||
23 | #define IDE_ARCH_OBSOLETE_DEFAULTS | ||
24 | |||
25 | static __inline__ int ide_default_irq(unsigned long base) | 23 | static __inline__ int ide_default_irq(unsigned long base) |
26 | { | 24 | { |
27 | switch (base) { | 25 | switch (base) { |
@@ -60,14 +58,6 @@ static __inline__ unsigned long ide_default_io_base(int index) | |||
60 | } | 58 | } |
61 | } | 59 | } |
62 | 60 | ||
63 | #define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */ | ||
64 | |||
65 | #ifdef CONFIG_BLK_DEV_IDEPCI | ||
66 | #define ide_init_default_irq(base) (0) | ||
67 | #else | ||
68 | #define ide_init_default_irq(base) ide_default_irq(base) | ||
69 | #endif | ||
70 | |||
71 | #include <asm-generic/ide_iops.h> | 61 | #include <asm-generic/ide_iops.h> |
72 | 62 | ||
73 | #endif /* __KERNEL__ */ | 63 | #endif /* __KERNEL__ */ |