diff --git a/[refs] b/[refs]
index 819c66c0aed7..3ff925c8cc79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be21ce119716f821c595552917ce7c05a3997b6b
+refs/heads/master: ceb31db11f78935c666c50fe9c99d4560d592fde
diff --git a/trunk/drivers/mtd/maps/Kconfig b/trunk/drivers/mtd/maps/Kconfig
index 4e2bd37b3d8a..6bdaacc6d6f9 100644
--- a/trunk/drivers/mtd/maps/Kconfig
+++ b/trunk/drivers/mtd/maps/Kconfig
@@ -200,8 +200,8 @@ config MTD_TSUNAMI
 	  Support for the flash chip on Tsunami TIG bus.
 
 config MTD_LASAT
-	tristate "Flash chips on LASAT board"
-	depends on LASAT
+	tristate "LASAT flash device"
+	depends on LASAT && MTD_CFI
 	help
 	  Support for the flash chips on the Lasat 100 and 200 boards.