diff --git a/[refs] b/[refs]
index faeef3ab40fc..5b4b6c5e3a74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d159c4e5fb7b755b9f254768293da7737790ac5b
+refs/heads/master: e1f5b3f6a8370a053326077b413c61026e3f710a
diff --git a/trunk/drivers/mtd/nand/Kconfig b/trunk/drivers/mtd/nand/Kconfig
index ce5cf020cd76..6010b500f93d 100644
--- a/trunk/drivers/mtd/nand/Kconfig
+++ b/trunk/drivers/mtd/nand/Kconfig
@@ -452,7 +452,7 @@ config MTD_NAND_NANDSIM
 	  MTD nand layer.
 
 config MTD_NAND_GPMI_NAND
-        bool "GPMI NAND Flash Controller driver"
+        tristate "GPMI NAND Flash Controller driver"
         depends on MTD_NAND && MXS_DMA
         help
 	 Enables NAND Flash support for IMX23, IMX28 or IMX6.