diff options
Diffstat (limited to 'include/asm-powerpc/ide.h')
-rw-r--r-- | include/asm-powerpc/ide.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-powerpc/ide.h b/include/asm-powerpc/ide.h index b09b42af6a1e..c8390f9485de 100644 --- a/include/asm-powerpc/ide.h +++ b/include/asm-powerpc/ide.h | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
13 | #include <asm/mpc8xx.h> | 13 | #include <asm/mpc8xx.h> |
14 | #endif | 14 | #endif |
15 | #include <asm/io.h> | ||
15 | 16 | ||
16 | #ifndef MAX_HWIFS | 17 | #ifndef MAX_HWIFS |
17 | #ifdef __powerpc64__ | 18 | #ifdef __powerpc64__ |
@@ -21,15 +22,14 @@ | |||
21 | #endif | 22 | #endif |
22 | #endif | 23 | #endif |
23 | 24 | ||
25 | #define __ide_mm_insw(p, a, c) _insw_ns((volatile u16 __iomem *)(p), (a), (c)) | ||
26 | #define __ide_mm_insl(p, a, c) _insl_ns((volatile u32 __iomem *)(p), (a), (c)) | ||
27 | #define __ide_mm_outsw(p, a, c) _outsw_ns((volatile u16 __iomem *)(p), (a), (c)) | ||
28 | #define __ide_mm_outsl(p, a, c) _outsl_ns((volatile u32 __iomem *)(p), (a), (c)) | ||
29 | |||
24 | #ifndef __powerpc64__ | 30 | #ifndef __powerpc64__ |
25 | #include <linux/hdreg.h> | 31 | #include <linux/hdreg.h> |
26 | #include <linux/ioport.h> | 32 | #include <linux/ioport.h> |
27 | #include <asm/io.h> | ||
28 | |||
29 | extern void __ide_mm_insw(void __iomem *port, void *addr, u32 count); | ||
30 | extern void __ide_mm_outsw(void __iomem *port, void *addr, u32 count); | ||
31 | extern void __ide_mm_insl(void __iomem *port, void *addr, u32 count); | ||
32 | extern void __ide_mm_outsl(void __iomem *port, void *addr, u32 count); | ||
33 | 33 | ||
34 | struct ide_machdep_calls { | 34 | struct ide_machdep_calls { |
35 | int (*default_irq)(unsigned long base); | 35 | int (*default_irq)(unsigned long base); |