diff options
Diffstat (limited to 'arch/arm/plat-iop')
-rw-r--r-- | arch/arm/plat-iop/adma.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-iop/i2c.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-iop/io.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-iop/pci.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-iop/time.c | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/plat-iop/adma.c b/arch/arm/plat-iop/adma.c index 53c5e9a52eb1..f72420821619 100644 --- a/arch/arm/plat-iop/adma.c +++ b/arch/arm/plat-iop/adma.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
20 | #include <asm/hardware/iop3xx.h> | 20 | #include <asm/hardware/iop3xx.h> |
21 | #include <linux/dma-mapping.h> | 21 | #include <linux/dma-mapping.h> |
22 | #include <asm/arch/adma.h> | 22 | #include <mach/adma.h> |
23 | #include <asm/hardware/iop_adma.h> | 23 | #include <asm/hardware/iop_adma.h> |
24 | 24 | ||
25 | #ifdef CONFIG_ARCH_IOP32X | 25 | #ifdef CONFIG_ARCH_IOP32X |
diff --git a/arch/arm/plat-iop/i2c.c b/arch/arm/plat-iop/i2c.c index b7b8fcb9108c..6dcbcc4ad419 100644 --- a/arch/arm/plat-iop/i2c.c +++ b/arch/arm/plat-iop/i2c.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <asm/setup.h> | 25 | #include <asm/setup.h> |
26 | #include <asm/system.h> | 26 | #include <asm/system.h> |
27 | #include <asm/memory.h> | 27 | #include <asm/memory.h> |
28 | #include <asm/arch/hardware.h> | 28 | #include <mach/hardware.h> |
29 | #include <asm/hardware/iop3xx.h> | 29 | #include <asm/hardware/iop3xx.h> |
30 | #include <asm/mach/arch.h> | 30 | #include <asm/mach/arch.h> |
31 | 31 | ||
diff --git a/arch/arm/plat-iop/io.c b/arch/arm/plat-iop/io.c index c30d1885af3d..39dcfb4bdc71 100644 --- a/arch/arm/plat-iop/io.c +++ b/arch/arm/plat-iop/io.c | |||
@@ -18,7 +18,7 @@ | |||
18 | */ | 18 | */ |
19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
21 | #include <asm/arch/hardware.h> | 21 | #include <mach/hardware.h> |
22 | #include <asm/io.h> | 22 | #include <asm/io.h> |
23 | 23 | ||
24 | void * __iomem __iop3xx_ioremap(unsigned long cookie, size_t size, | 24 | void * __iomem __iop3xx_ioremap(unsigned long cookie, size_t size, |
diff --git a/arch/arm/plat-iop/pci.c b/arch/arm/plat-iop/pci.c index e32054fbe524..54708bf9cb15 100644 --- a/arch/arm/plat-iop/pci.c +++ b/arch/arm/plat-iop/pci.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <asm/irq.h> | 21 | #include <asm/irq.h> |
22 | #include <asm/signal.h> | 22 | #include <asm/signal.h> |
23 | #include <asm/system.h> | 23 | #include <asm/system.h> |
24 | #include <asm/arch/hardware.h> | 24 | #include <mach/hardware.h> |
25 | #include <asm/mach/pci.h> | 25 | #include <asm/mach/pci.h> |
26 | #include <asm/hardware/iop3xx.h> | 26 | #include <asm/hardware/iop3xx.h> |
27 | 27 | ||
diff --git a/arch/arm/plat-iop/time.c b/arch/arm/plat-iop/time.c index da9e82441c53..c53fefb6aac4 100644 --- a/arch/arm/plat-iop/time.c +++ b/arch/arm/plat-iop/time.c | |||
@@ -18,13 +18,13 @@ | |||
18 | #include <linux/time.h> | 18 | #include <linux/time.h> |
19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
20 | #include <linux/timex.h> | 20 | #include <linux/timex.h> |
21 | #include <asm/arch/hardware.h> | 21 | #include <mach/hardware.h> |
22 | #include <asm/io.h> | 22 | #include <asm/io.h> |
23 | #include <asm/irq.h> | 23 | #include <asm/irq.h> |
24 | #include <asm/uaccess.h> | 24 | #include <asm/uaccess.h> |
25 | #include <asm/mach/irq.h> | 25 | #include <asm/mach/irq.h> |
26 | #include <asm/mach/time.h> | 26 | #include <asm/mach/time.h> |
27 | #include <asm/arch/time.h> | 27 | #include <mach/time.h> |
28 | 28 | ||
29 | static unsigned long ticks_per_jiffy; | 29 | static unsigned long ticks_per_jiffy; |
30 | static unsigned long ticks_per_usec; | 30 | static unsigned long ticks_per_usec; |