diff options
| author | Logan Gunthorpe <logang@deltatee.com> | 2018-03-27 17:08:28 -0600 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-04-05 14:58:52 +1000 |
| commit | ef237039c5c86b6587ee1fd88857a24fa5978474 (patch) | |
| tree | 8727e3276e24a6e90711ca944f4e1e87c4e98b91 /arch/powerpc | |
| parent | ad7b4e8022b9864c075fe71e1328b1d25cad82f6 (diff) | |
| download | linux-stable-ef237039c5c86b6587ee1fd88857a24fa5978474.tar.gz linux-stable-ef237039c5c86b6587ee1fd88857a24fa5978474.tar.bz2 linux-stable-ef237039c5c86b6587ee1fd88857a24fa5978474.zip | |
powerpc: io.h: move iomap.h include so that it can use readq/writeq defs
Subsequent patches in this series makes use of the readq and writeq
defines in iomap.h. However, as is, they get missed on the powerpc
platform seeing the include comes before the define. This patch moves
the include down to fix this.
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc')
| -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; #include <asm/mmu.h> #include <asm/ppc_asm.h> -#include <asm-generic/iomap.h> - #ifdef CONFIG_PPC64 #include <asm/paca.h> #endif @@ -663,6 +661,8 @@ static inline void name at \ #define writel_relaxed(v, addr) writel(v, addr) #define writeq_relaxed(v, addr) writeq(v, addr) +#include <asm-generic/iomap.h> + #ifdef CONFIG_PPC32 #define mmiowb() #else |