[ARM] Convert asm/io.h to linux/io.h

[linux-2.6-omap-h63xx.git] / arch / arm / plat-s3c24xx / common-smdk.c

diff --git a/arch/arm/plat-s3c24xx/common-smdk.c b/arch/arm/plat-s3c24xx/common-smdk.c
index 908efa7d745fbc98fea12ecd38079e3dcd41dbaf..d528f460f6bc48027a6155a4084adb9d079ff63e 100644 (file)
--- a/arch/arm/plat-s3c24xx/common-smdk.c
+++ b/arch/arm/plat-s3c24xx/common-smdk.c
@@ -18,25 +18,27 @@
 #include <linux/list.h>
 #include <linux/timer.h>
 #include <linux/init.h>
+#include <linux/sysdev.h>
 #include <linux/platform_device.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
+#include <linux/io.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/hardware.h>
-#include <asm/io.h>
+#include <asm/mach-types.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/leds-gpio.h>
+#include <mach/regs-gpio.h>
+#include <mach/leds-gpio.h>
 
-#include <asm/arch/nand.h>
+#include <asm/plat-s3c/nand.h>
 
 #include <asm/plat-s3c24xx/common-smdk.h>
 #include <asm/plat-s3c24xx/devs.h>
@@ -192,6 +194,9 @@ void __init smdk_machine_init(void)
        s3c2410_gpio_setpin(S3C2410_GPF6, 1);
        s3c2410_gpio_setpin(S3C2410_GPF7, 1);
 
+       if (machine_is_smdk2443())
+               smdk_nand_info.twrph0 = 50;
+
        s3c_device_nand.dev.platform_data = &smdk_nand_info;
 
        platform_add_devices(smdk_devs, ARRAY_SIZE(smdk_devs));