Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-omap-h63xx.git] / drivers / mtd / maps / Kconfig

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index b665e4ac2208458bc70d1f8dfe9cd00a3a6a58fd..cc6c734424350e17de559c8551a470e70f7e5639 100644 (file)
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -103,7 +103,7 @@ config MTD_PMC_MSP_RAMROOT
 
 config MTD_SUN_UFLASH
        tristate "Sun Microsystems userflash support"
-       depends on SPARC && MTD_CFI
+       depends on SPARC && MTD_CFI && PCI
        help
          This provides a 'mapping' driver which supports the way in
          which user-programmable flash chips are connected on various
@@ -258,12 +258,6 @@ config MTD_TSUNAMI
        help
          Support for the flash chip on Tsunami TIG bus.
 
-config MTD_LASAT
-       tristate "LASAT flash device"
-       depends on LASAT && MTD_CFI
-       help
-         Support for the flash chips on the Lasat 100 and 200 boards.
-
 config MTD_NETtel
        tristate "CFI flash device on SnapGear/SecureEdge"
        depends on X86 && MTD_PARTITIONS && MTD_JEDECPROBE