3 files changed, 6 insertions, 8 deletions

diff --git a/drivers/mtd/maps/uclinux.c b/drivers/mtd/maps/uclinux.c
index cfff454f628b..c3bb304eca07 100644
--- a/drivers/mtd/maps/uclinux.c
+++ b/drivers/mtd/maps/uclinux.c
@@ -19,14 +19,13 @@
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
 #include <asm/io.h>
+#include <asm/sections.h>
 
 /****************************************************************************/
 
-extern char _ebss;
-
 struct map_info uclinux_ram_map = {
         .name = "RAM",
-        .phys = (unsigned long)&_ebss,
+        .phys = (unsigned long)__bss_stop,
         .size = 0,
 };
 
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 31bb7e5b504a..8ca417614c57 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -480,7 +480,7 @@ config MTD_NAND_NANDSIM
 
 config MTD_NAND_GPMI_NAND
         bool "GPMI NAND Flash Controller driver"
-        depends on MTD_NAND && (SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q)
+        depends on MTD_NAND && MXS_DMA
         help
          Enables NAND Flash support for IMX23 or IMX28.
          The GPMI controller is very powerful, with the help of BCH
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index e9309b3659e7..ac4fd756eda3 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -1245,7 +1245,6 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
                         goto out_release_mem_region;
                 } else {
                         struct dma_slave_config cfg;
-                        int rc;
 
                         memset(&cfg, 0, sizeof(cfg));
                         cfg.src_addr = info->phys_base;
@@ -1254,10 +1253,10 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
                         cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
                         cfg.src_maxburst = 16;
                         cfg.dst_maxburst = 16;
-                        rc = dmaengine_slave_config(info->dma, &cfg);
-                        if (rc) {
+                        err = dmaengine_slave_config(info->dma, &cfg);
+                        if (err) {
                                 dev_err(&pdev->dev, "DMA engine slave config failed: %d\n",
-                                        rc);
+                                        err);
                                 goto out_release_mem_region;
                         }
                         info->nand.read_buf   = omap_read_buf_dma_pref;