diff options
-rw-r--r-- | arch/powerpc/include/asm/io.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h index 422f99cf9924..af074923d598 100644 --- a/arch/powerpc/include/asm/io.h +++ b/arch/powerpc/include/asm/io.h | |||
@@ -33,8 +33,6 @@ extern struct pci_dev *isa_bridge_pcidev; | |||
33 | #include <asm/mmu.h> | 33 | #include <asm/mmu.h> |
34 | #include <asm/ppc_asm.h> | 34 | #include <asm/ppc_asm.h> |
35 | 35 | ||
36 | #include <asm-generic/iomap.h> | ||
37 | |||
38 | #ifdef CONFIG_PPC64 | 36 | #ifdef CONFIG_PPC64 |
39 | #include <asm/paca.h> | 37 | #include <asm/paca.h> |
40 | #endif | 38 | #endif |
@@ -663,6 +661,8 @@ static inline void name at \ | |||
663 | #define writel_relaxed(v, addr) writel(v, addr) | 661 | #define writel_relaxed(v, addr) writel(v, addr) |
664 | #define writeq_relaxed(v, addr) writeq(v, addr) | 662 | #define writeq_relaxed(v, addr) writeq(v, addr) |
665 | 663 | ||
664 | #include <asm-generic/iomap.h> | ||
665 | |||
666 | #ifdef CONFIG_PPC32 | 666 | #ifdef CONFIG_PPC32 |
667 | #define mmiowb() | 667 | #define mmiowb() |
668 | #else | 668 | #else |