Merge tag 'for-linus-20130301' of git://git.infradead.org/linux-mtd

[karo-tx-linux.git] / drivers / mtd / Kconfig

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 73fcbbeb78d05ff2dc3b695dd1aad00064783fcd..557bec599f4f6741255a3f6c16f6aff0c6d4585b 100644 (file)
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -74,8 +74,8 @@ config MTD_REDBOOT_PARTS_READONLY
 endif # MTD_REDBOOT_PARTS
 
 config MTD_CMDLINE_PARTS
-       bool "Command line partition table parsing"
-       depends on MTD = "y"
+       tristate "Command line partition table parsing"
+       depends on MTD
        ---help---
          Allow generic configuration of the MTD partition tables via the kernel
          command line. Multiple flash resources are supported for hardware where
@@ -291,7 +291,7 @@ config SSFDC
 
 config SM_FTL
        tristate "SmartMedia/xD new translation layer"
-       depends on EXPERIMENTAL && BLOCK
+       depends on BLOCK
        select MTD_BLKDEVS
        select MTD_NAND_ECC
        help