aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/asm-alpha/ide.h6
-rw-r--r--include/asm-ia64/ide.h6
-rw-r--r--include/asm-m32r/ide.h6
-rw-r--r--include/asm-mips/mach-generic/ide.h6
-rw-r--r--include/asm-powerpc/ide.h6
-rw-r--r--include/asm-x86/ide.h6
6 files changed, 0 insertions, 36 deletions
diff --git a/include/asm-alpha/ide.h b/include/asm-alpha/ide.h
index e67c38c96a6b..f44129abc02c 100644
--- a/include/asm-alpha/ide.h
+++ b/include/asm-alpha/ide.h
@@ -37,12 +37,6 @@ static inline unsigned long ide_default_io_base(int index)
37 } 37 }
38} 38}
39 39
40#ifdef CONFIG_PCI
41#define ide_init_default_irq(base) (0)
42#else
43#define ide_init_default_irq(base) ide_default_irq(base)
44#endif
45
46#include <asm-generic/ide_iops.h> 40#include <asm-generic/ide_iops.h>
47 41
48#endif /* __KERNEL__ */ 42#endif /* __KERNEL__ */
diff --git a/include/asm-ia64/ide.h b/include/asm-ia64/ide.h
index 989edb6f1285..8fa3f8cd067a 100644
--- a/include/asm-ia64/ide.h
+++ b/include/asm-ia64/ide.h
@@ -44,12 +44,6 @@ static inline unsigned long ide_default_io_base(int index)
44 } 44 }
45} 45}
46 46
47#ifdef CONFIG_PCI
48#define ide_init_default_irq(base) (0)
49#else
50#define ide_init_default_irq(base) ide_default_irq(base)
51#endif
52
53#include <asm-generic/ide_iops.h> 47#include <asm-generic/ide_iops.h>
54 48
55#endif /* __KERNEL__ */ 49#endif /* __KERNEL__ */
diff --git a/include/asm-m32r/ide.h b/include/asm-m32r/ide.h
index 41bd33861ebe..1e7f6474d130 100644
--- a/include/asm-m32r/ide.h
+++ b/include/asm-m32r/ide.h
@@ -63,12 +63,6 @@ static __inline__ unsigned long ide_default_io_base(int index)
63 } 63 }
64} 64}
65 65
66#ifdef CONFIG_BLK_DEV_IDEPCI
67#define ide_init_default_irq(base) (0)
68#else
69#define ide_init_default_irq(base) ide_default_irq(base)
70#endif
71
72#include <asm-generic/ide_iops.h> 66#include <asm-generic/ide_iops.h>
73 67
74#endif /* __KERNEL__ */ 68#endif /* __KERNEL__ */
diff --git a/include/asm-mips/mach-generic/ide.h b/include/asm-mips/mach-generic/ide.h
index 7a9093187fe9..0f6c251f5fec 100644
--- a/include/asm-mips/mach-generic/ide.h
+++ b/include/asm-mips/mach-generic/ide.h
@@ -96,12 +96,6 @@ static __inline__ unsigned long ide_default_io_base(int index)
96 } 96 }
97} 97}
98 98
99#ifdef CONFIG_BLK_DEV_IDEPCI
100#define ide_init_default_irq(base) (0)
101#else
102#define ide_init_default_irq(base) ide_default_irq(base)
103#endif
104
105/* MIPS port and memory-mapped I/O string operations. */ 99/* MIPS port and memory-mapped I/O string operations. */
106static inline void __ide_flush_prologue(void) 100static inline void __ide_flush_prologue(void)
107{ 101{
diff --git a/include/asm-powerpc/ide.h b/include/asm-powerpc/ide.h
index 17c51efff67c..3d90bf7d3d73 100644
--- a/include/asm-powerpc/ide.h
+++ b/include/asm-powerpc/ide.h
@@ -73,12 +73,6 @@ static __inline__ unsigned long ide_default_io_base(int index)
73 return 0; 73 return 0;
74} 74}
75 75
76#ifdef CONFIG_PCI
77#define ide_init_default_irq(base) (0)
78#else
79#define ide_init_default_irq(base) ide_default_irq(base)
80#endif
81
82#ifdef CONFIG_BLK_DEV_MPC8xx_IDE 76#ifdef CONFIG_BLK_DEV_MPC8xx_IDE
83#define IDE_ARCH_ACK_INTR 1 77#define IDE_ARCH_ACK_INTR 1
84#define ide_ack_intr(hwif) ((hwif)->ack_intr ? (hwif)->ack_intr(hwif) : 1) 78#define ide_ack_intr(hwif) ((hwif)->ack_intr ? (hwif)->ack_intr(hwif) : 1)
diff --git a/include/asm-x86/ide.h b/include/asm-x86/ide.h
index 800edccd33f1..cf9c98e5bdb5 100644
--- a/include/asm-x86/ide.h
+++ b/include/asm-x86/ide.h
@@ -58,12 +58,6 @@ static __inline__ unsigned long ide_default_io_base(int index)
58 } 58 }
59} 59}
60 60
61#ifdef CONFIG_BLK_DEV_IDEPCI
62#define ide_init_default_irq(base) (0)
63#else
64#define ide_init_default_irq(base) ide_default_irq(base)
65#endif
66
67#include <asm-generic/ide_iops.h> 61#include <asm-generic/ide_iops.h>
68 62
69#endif /* __KERNEL__ */ 63#endif /* __KERNEL__ */