diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-09-06 12:11:37 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-09-06 12:11:37 +0100 |
| commit | 8029db12ae490cb49495503adce99ce4ca3a0bdb (patch) | |
| tree | 242a7ad7c5c3bbcfbbb5c05dee194a7edbf76cc4 | |
| parent | fced80c735941fa518ac67c0b61bbe153fb8c050 (diff) | |
| download | kernel_samsung_aries-8029db12ae490cb49495503adce99ce4ca3a0bdb.zip kernel_samsung_aries-8029db12ae490cb49495503adce99ce4ca3a0bdb.tar.gz kernel_samsung_aries-8029db12ae490cb49495503adce99ce4ca3a0bdb.tar.bz2 | |
[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 9b2d2ec..f4a0c1b 100644 --- a/arch/arm/mach-ixp4xx/ixdp425-setup.c +++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c @@ -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", diff --git a/arch/arm/plat-s3c24xx/cpu.c b/arch/arm/plat-s3c24xx/cpu.c index d633274..9c607bb 100644 --- a/arch/arm/plat-s3c24xx/cpu.c +++ b/arch/arm/plat-s3c24xx/cpu.c @@ -30,10 +30,10 @@ #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> |