Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6

[mirror_ubuntu-artful-kernel.git] / arch / arm / mach-u300 / core.c

diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index 8b90c44d237f92d2afcb261cf698500979842fea..1621ad07d284fea97626fea99a3e5535844c8417 100644 (file)
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -1544,6 +1544,8 @@ static struct fsmc_nand_platform_data nand_platform_data = {
        .nr_partitions = ARRAY_SIZE(u300_partitions),
        .options = NAND_SKIP_BBTSCAN,
        .width = FSMC_NAND_BW8,
+       .ale_off = PLAT_NAND_ALE,
+       .cle_off = PLAT_NAND_CLE,
 };
 
 static struct platform_device nand_device = {