[ARM] Convert asm/delay.h to linux/delay.h
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 6 Sep 2008 11:11:37 +0000 (12:11 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 6 Sep 2008 11:11:37 +0000 (12:11 +0100)
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-ixp4xx/ixdp425-setup.c
arch/arm/plat-s3c24xx/cpu.c

index 9b2d2ec14c8067153ae7e2741f8af05cf590e42c..f4a0c1bc133111e7674f240546734803085a2d99 100644 (file)
@@ -20,6 +20,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
+#include <linux/delay.h>
 
 #include <asm/types.h>
 #include <asm/setup.h>
@@ -29,7 +30,6 @@
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
-#include <asm/delay.h>
 
 static struct flash_platform_data ixdp425_flash_data = {
        .map_name       = "cfi_probe",
index d633274e6a8d39cd0633f6059b1ad96ce36f4420..9c607bbc9343bc34712536a66cd2a30b9d4ce556 100644 (file)
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/io.h>
+#include <linux/delay.h>
 
 #include <mach/hardware.h>
 #include <asm/irq.h>
-#include <asm/delay.h>
 #include <asm/cacheflush.h>
 
 #include <asm/mach/arch.h>