diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-09-06 07:11:37 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-09-06 07:11:37 -0400 |
commit | 8029db12ae490cb49495503adce99ce4ca3a0bdb (patch) | |
tree | 242a7ad7c5c3bbcfbbb5c05dee194a7edbf76cc4 | |
parent | fced80c735941fa518ac67c0b61bbe153fb8c050 (diff) |
[ARM] Convert asm/delay.h to linux/delay.h
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/mach-ixp4xx/ixdp425-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/cpu.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c index 9b2d2ec14c80..f4a0c1bc1331 100644 --- a/arch/arm/mach-ixp4xx/ixdp425-setup.c +++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/mtd/mtd.h> | 20 | #include <linux/mtd/mtd.h> |
21 | #include <linux/mtd/nand.h> | 21 | #include <linux/mtd/nand.h> |
22 | #include <linux/mtd/partitions.h> | 22 | #include <linux/mtd/partitions.h> |
23 | #include <linux/delay.h> | ||
23 | 24 | ||
24 | #include <asm/types.h> | 25 | #include <asm/types.h> |
25 | #include <asm/setup.h> | 26 | #include <asm/setup.h> |
@@ -29,7 +30,6 @@ | |||
29 | #include <asm/irq.h> | 30 | #include <asm/irq.h> |
30 | #include <asm/mach/arch.h> | 31 | #include <asm/mach/arch.h> |
31 | #include <asm/mach/flash.h> | 32 | #include <asm/mach/flash.h> |
32 | #include <asm/delay.h> | ||
33 | 33 | ||
34 | static struct flash_platform_data ixdp425_flash_data = { | 34 | static struct flash_platform_data ixdp425_flash_data = { |
35 | .map_name = "cfi_probe", | 35 | .map_name = "cfi_probe", |
diff --git a/arch/arm/plat-s3c24xx/cpu.c b/arch/arm/plat-s3c24xx/cpu.c index d633274e6a8d..9c607bbc9343 100644 --- a/arch/arm/plat-s3c24xx/cpu.c +++ b/arch/arm/plat-s3c24xx/cpu.c | |||
@@ -30,10 +30,10 @@ | |||
30 | #include <linux/platform_device.h> | 30 | #include <linux/platform_device.h> |
31 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
32 | #include <linux/io.h> | 32 | #include <linux/io.h> |
33 | #include <linux/delay.h> | ||
33 | 34 | ||
34 | #include <mach/hardware.h> | 35 | #include <mach/hardware.h> |
35 | #include <asm/irq.h> | 36 | #include <asm/irq.h> |
36 | #include <asm/delay.h> | ||
37 | #include <asm/cacheflush.h> | 37 | #include <asm/cacheflush.h> |
38 | 38 | ||
39 | #include <asm/mach/arch.h> | 39 | #include <asm/mach/arch.h> |