aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ixp4xx
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-09-06 12:11:37 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-09-06 12:11:37 +0100
commit8029db12ae490cb49495503adce99ce4ca3a0bdb (patch)
tree242a7ad7c5c3bbcfbbb5c05dee194a7edbf76cc4 /arch/arm/mach-ixp4xx
parentfced80c735941fa518ac67c0b61bbe153fb8c050 (diff)
downloadkernel_samsung_tuna-8029db12ae490cb49495503adce99ce4ca3a0bdb.zip
kernel_samsung_tuna-8029db12ae490cb49495503adce99ce4ca3a0bdb.tar.gz
kernel_samsung_tuna-8029db12ae490cb49495503adce99ce4ca3a0bdb.tar.bz2
[ARM] Convert asm/delay.h to linux/delay.h
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ixp4xx')
-rw-r--r--arch/arm/mach-ixp4xx/ixdp425-setup.c2
1 files changed, 1 insertions, 1 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",