Merge tag 'for-linus-20141015' of git://git.infradead.org/linux-mtd

[linux-2.6-block.git] / arch / arm / mach-omap2 / gpmc.c

diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index a4d52c42a438e15d3b60b8b3494690fa955f7403..5fa3755261ce661fe11c6b8d9b0094d14fb317dc 100644 (file)
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -1440,6 +1440,8 @@ static int gpmc_probe_nand_child(struct platform_device *pdev,
                                break;
                        }
 
+       gpmc_nand_data->flash_bbt = of_get_nand_on_flash_bbt(child);
+
        val = of_get_nand_bus_width(child);
        if (val == 16)
                gpmc_nand_data->devsize = NAND_BUSWIDTH_16;