Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[mv-sheeva.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..398c7ac25296bc8fb63c71354e7fb2384d759c41 100644 (file)
--- a/arch/arm/plat-s3c24xx/common-smdk.c
+++ b/arch/arm/plat-s3c24xx/common-smdk.c
@@ -18,6 +18,7 @@
 #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>
@@ -29,6 +30,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
+#include <asm/mach-types.h>
 #include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -36,7 +38,7 @@
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/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));