diff options
author | Rob Herring <rob.herring@calxeda.com> | 2012-02-29 11:58:05 -0500 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2012-03-06 22:34:37 -0500 |
commit | 17d971e5dceef87bb6fe179a942c8f6191afbab9 (patch) | |
tree | 9fccff087601b51b106727af7a8388092f3e581b /arch/arm/mach-iop13xx | |
parent | 21a5365b03975e2425e030ad072f32a9dd3387fb (diff) |
ARM: iop13xx: move io.h externs to pci.h
These variables are just needed in pci.c and io.c, so move them out of
io.h in preparation to remove io.h.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-iop13xx')
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/io.h | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/io.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/pci.h | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/mach-iop13xx/include/mach/io.h b/arch/arm/mach-iop13xx/include/mach/io.h index 2a69fc0c7223..058dbfdf7066 100644 --- a/arch/arm/mach-iop13xx/include/mach/io.h +++ b/arch/arm/mach-iop13xx/include/mach/io.h | |||
@@ -26,9 +26,5 @@ | |||
26 | #define __mem_isa(a) (a) | 26 | #define __mem_isa(a) (a) |
27 | 27 | ||
28 | extern void __iomem * __iop13xx_io(unsigned long io_addr); | 28 | extern void __iomem * __iop13xx_io(unsigned long io_addr); |
29 | extern u32 iop13xx_atue_mem_base; | ||
30 | extern u32 iop13xx_atux_mem_base; | ||
31 | extern size_t iop13xx_atue_mem_size; | ||
32 | extern size_t iop13xx_atux_mem_size; | ||
33 | 29 | ||
34 | #endif | 30 | #endif |
diff --git a/arch/arm/mach-iop13xx/io.c b/arch/arm/mach-iop13xx/io.c index 6dd5b4924107..3c364198db9c 100644 --- a/arch/arm/mach-iop13xx/io.c +++ b/arch/arm/mach-iop13xx/io.c | |||
@@ -21,6 +21,8 @@ | |||
21 | #include <linux/io.h> | 21 | #include <linux/io.h> |
22 | #include <mach/hardware.h> | 22 | #include <mach/hardware.h> |
23 | 23 | ||
24 | #include "pci.h" | ||
25 | |||
24 | void * __iomem __iop13xx_io(unsigned long io_addr) | 26 | void * __iomem __iop13xx_io(unsigned long io_addr) |
25 | { | 27 | { |
26 | void __iomem * io_virt; | 28 | void __iomem * io_virt; |
diff --git a/arch/arm/mach-iop13xx/pci.h b/arch/arm/mach-iop13xx/pci.h new file mode 100644 index 000000000000..c70cf5b41e31 --- /dev/null +++ b/arch/arm/mach-iop13xx/pci.h | |||
@@ -0,0 +1,6 @@ | |||
1 | #include <linux/types.h> | ||
2 | |||
3 | extern u32 iop13xx_atue_mem_base; | ||
4 | extern u32 iop13xx_atux_mem_base; | ||
5 | extern size_t iop13xx_atue_mem_size; | ||
6 | extern size_t iop13xx_atux_mem_size; | ||