From: Martin Michlmayr <tbm@cyrius.com>
Date: Mon, 20 Mar 2006 04:40:46 +0000 (+0000)
Subject: LASAT depends on MTD_CFI
X-Git-Tag: v2.6.18-rc1~1105^2~86
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ceb31db11f78935c666c50fe9c99d4560d592fde;p=linux-2.6-omap-h63xx.git

LASAT depends on MTD_CFI

The following difference was found between the mainline and linux-mips
kernel.  LASAT depends on MTD_CFI.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 4e2bd37b3d8..6bdaacc6d6f 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/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.