tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[ARM] 1/4: Move include of asm/hardware.h to asm-arm/arch-*/io.h

Including asm/hardware.h into asm/io.h can cause #define clashes
between platform specific definitions and driver local definitions.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by

Russell King and committed by
Russell King 7fca0aa4 741b2252

+38 -3
+2
include/asm-arm/arch-aaec2000/io.h
··· 6 6 #ifndef __ASM_ARM_ARCH_IO_H 7 7 #define __ASM_ARM_ARCH_IO_H 8 8 9 + #include <asm/hardware.h> 10 + 9 11 #define IO_SPACE_LIMIT 0xffffffff 10 12 11 13 /*
+2
include/asm-arm/arch-cl7500/io.h
··· 10 10 #ifndef __ASM_ARM_ARCH_IO_H 11 11 #define __ASM_ARM_ARCH_IO_H 12 12 13 + #include <asm/hardware.h> 14 + 13 15 #define IO_SPACE_LIMIT 0xffffffff 14 16 15 17 /*
+2
include/asm-arm/arch-clps711x/io.h
··· 20 20 #ifndef __ASM_ARM_ARCH_IO_H 21 21 #define __ASM_ARM_ARCH_IO_H 22 22 23 + #include <asm/hardware.h> 24 + 23 25 #define IO_SPACE_LIMIT 0xffffffff 24 26 25 27 #define __io(a) ((void __iomem *)(a))
+2
include/asm-arm/arch-ebsa110/io.h
··· 13 13 #ifndef __ASM_ARM_ARCH_IO_H 14 14 #define __ASM_ARM_ARCH_IO_H 15 15 16 + #include <asm/hardware.h> 17 + 16 18 #define IO_SPACE_LIMIT 0xffff 17 19 18 20 u8 __inb8(unsigned int port);
+2
include/asm-arm/arch-ebsa285/io.h
··· 14 14 #ifndef __ASM_ARM_ARCH_IO_H 15 15 #define __ASM_ARM_ARCH_IO_H 16 16 17 + #include <asm/hardware.h> 18 + 17 19 #define IO_SPACE_LIMIT 0xffff 18 20 19 21 /*
+2
include/asm-arm/arch-epxa10db/io.h
··· 20 20 #ifndef __ASM_ARM_ARCH_IO_H 21 21 #define __ASM_ARM_ARCH_IO_H 22 22 23 + #include <asm/hardware.h> 24 + 23 25 #define IO_SPACE_LIMIT 0xffff 24 26 25 27
+1 -1
include/asm-arm/arch-h720x/io.h
··· 14 14 #ifndef __ASM_ARM_ARCH_IO_H 15 15 #define __ASM_ARM_ARCH_IO_H 16 16 17 - #include <asm/arch/hardware.h> 17 + #include <asm/hardware.h> 18 18 19 19 #define IO_SPACE_LIMIT 0xffffffff 20 20
+2
include/asm-arm/arch-imx/io.h
··· 20 20 #ifndef __ASM_ARM_ARCH_IO_H 21 21 #define __ASM_ARM_ARCH_IO_H 22 22 23 + #include <asm/hardware.h> 24 + 23 25 #define IO_SPACE_LIMIT 0xffffffff 24 26 25 27 #define __io(a) ((void __iomem *)(a))
+2
include/asm-arm/arch-integrator/io.h
··· 20 20 #ifndef __ASM_ARM_ARCH_IO_H 21 21 #define __ASM_ARM_ARCH_IO_H 22 22 23 + #include <asm/hardware.h> 24 + 23 25 #define IO_SPACE_LIMIT 0xffff 24 26 25 27 #define __io(a) ((void __iomem *)(PCI_IO_VADDR + (a)))
+2
include/asm-arm/arch-iop3xx/io.h
··· 11 11 #ifndef __ASM_ARM_ARCH_IO_H 12 12 #define __ASM_ARM_ARCH_IO_H 13 13 14 + #include <asm/hardware.h> 15 + 14 16 #define IO_SPACE_LIMIT 0xffffffff 15 17 16 18 #define __io(p) ((void __iomem *)(p))
+2
include/asm-arm/arch-ixp2000/io.h
··· 15 15 #ifndef __ASM_ARM_ARCH_IO_H 16 16 #define __ASM_ARM_ARCH_IO_H 17 17 18 + #include <asm/hardware.h> 19 + 18 20 #define IO_SPACE_LIMIT 0xffffffff 19 21 #define __mem_pci(a) (a) 20 22
+1 -1
include/asm-arm/arch-l7200/io.h
··· 10 10 #ifndef __ASM_ARM_ARCH_IO_H 11 11 #define __ASM_ARM_ARCH_IO_H 12 12 13 - #include <asm/arch/hardware.h> 13 + #include <asm/hardware.h> 14 14 15 15 #define IO_SPACE_LIMIT 0xffffffff 16 16
+2
include/asm-arm/arch-lh7a40x/io.h
··· 11 11 #ifndef __ASM_ARCH_IO_H 12 12 #define __ASM_ARCH_IO_H 13 13 14 + #include <asm/hardware.h> 15 + 14 16 #define IO_SPACE_LIMIT 0xffffffff 15 17 16 18 /* No ISA or PCI bus on this machine. */
+2
include/asm-arm/arch-omap/io.h
··· 34 34 #ifndef __ASM_ARM_ARCH_IO_H 35 35 #define __ASM_ARM_ARCH_IO_H 36 36 37 + #include <asm/hardware.h> 38 + 37 39 #define IO_SPACE_LIMIT 0xffffffff 38 40 39 41 /*
+2
include/asm-arm/arch-pxa/io.h
··· 6 6 #ifndef __ASM_ARM_ARCH_IO_H 7 7 #define __ASM_ARM_ARCH_IO_H 8 8 9 + #include <asm/hardware.h> 10 + 9 11 #define IO_SPACE_LIMIT 0xffffffff 10 12 11 13 /*
+2
include/asm-arm/arch-rpc/io.h
··· 13 13 #ifndef __ASM_ARM_ARCH_IO_H 14 14 #define __ASM_ARM_ARCH_IO_H 15 15 16 + #include <asm/hardware.h> 17 + 16 18 #define IO_SPACE_LIMIT 0xffffffff 17 19 18 20 /*
+2
include/asm-arm/arch-s3c2410/io.h
··· 15 15 #ifndef __ASM_ARM_ARCH_IO_H 16 16 #define __ASM_ARM_ARCH_IO_H 17 17 18 + #include <asm/hardware.h> 19 + 18 20 #define IO_SPACE_LIMIT 0xffffffff 19 21 20 22 /*
+2
include/asm-arm/arch-sa1100/io.h
··· 10 10 #ifndef __ASM_ARM_ARCH_IO_H 11 11 #define __ASM_ARM_ARCH_IO_H 12 12 13 + #include <asm/hardware.h> 14 + 13 15 #define IO_SPACE_LIMIT 0xffffffff 14 16 15 17 /*
+2
include/asm-arm/arch-shark/io.h
··· 11 11 #ifndef __ASM_ARM_ARCH_IO_H 12 12 #define __ASM_ARM_ARCH_IO_H 13 13 14 + #include <asm/hardware.h> 15 + 14 16 #define IO_SPACE_LIMIT 0xffffffff 15 17 16 18 /*
+2
include/asm-arm/arch-versatile/io.h
··· 20 20 #ifndef __ASM_ARM_ARCH_IO_H 21 21 #define __ASM_ARM_ARCH_IO_H 22 22 23 + #include <asm/hardware.h> 24 + 23 25 #define IO_SPACE_LIMIT 0xffffffff 24 26 25 27 static inline void __iomem *__io(unsigned long addr)
-1
include/asm-arm/io.h
··· 26 26 #include <linux/types.h> 27 27 #include <asm/byteorder.h> 28 28 #include <asm/memory.h> 29 - #include <asm/arch/hardware.h> 30 29 31 30 /* 32 31 * ISA I/O bus memory addresses are 1:1 with the physical address.