diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-05 16:14:15 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 09:55:48 +0100 |
commit | a09e64fbc0094e3073dbb09c3b4bfe4ab669244b (patch) | |
tree | 69689f467179891b498bd7423fcf61925173db31 /arch/arm/plat-iop | |
parent | a1b81a84fff05dbfef45b7012c26e1fee9973e5d (diff) | |
download | talos-op-linux-a09e64fbc0094e3073dbb09c3b4bfe4ab669244b.tar.gz talos-op-linux-a09e64fbc0094e3073dbb09c3b4bfe4ab669244b.zip |
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
This just leaves include/asm-arm/plat-* to deal with.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
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 @@ #include <linux/platform_device.h> #include <asm/hardware/iop3xx.h> #include <linux/dma-mapping.h> -#include <asm/arch/adma.h> +#include <mach/adma.h> #include <asm/hardware/iop_adma.h> #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 @@ #include <asm/setup.h> #include <asm/system.h> #include <asm/memory.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/hardware/iop3xx.h> #include <asm/mach/arch.h> 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 @@ */ #include <linux/kernel.h> #include <linux/module.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> 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 @@ #include <asm/irq.h> #include <asm/signal.h> #include <asm/system.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/mach/pci.h> #include <asm/hardware/iop3xx.h> 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 @@ #include <linux/time.h> #include <linux/init.h> #include <linux/timex.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/uaccess.h> #include <asm/mach/irq.h> #include <asm/mach/time.h> -#include <asm/arch/time.h> +#include <mach/time.h> static unsigned long ticks_per_jiffy; static unsigned long ticks_per_usec; |