Merge tag 'mfd-for-linus-3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / mtd / devices / Kconfig

diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig
index 1210bc2923b71386b94fd53bd4440d8df137486b..c49d0b127fefb32c38539810247ff4adc5adc0fa 100644 (file)
--- a/drivers/mtd/devices/Kconfig
+++ b/drivers/mtd/devices/Kconfig
@@ -80,7 +80,7 @@ config MTD_DATAFLASH_OTP
 
 config MTD_M25P80
        tristate "Support most SPI Flash chips (AT26DF, M25P, W25X, ...)"
-       depends on SPI_MASTER
+       depends on SPI_MASTER && MTD_SPI_NOR
        help
          This enables access to most modern SPI flash chips, used for
          program and data storage.   Series supported include Atmel AT26DF,
@@ -212,7 +212,7 @@ config MTD_DOCG3
 
 config MTD_ST_SPI_FSM
        tristate "ST Microelectronics SPI FSM Serial Flash Controller"
-       depends on ARM || SH
+       depends on ARCH_STI
        help
          This provides an MTD device driver for the ST Microelectronics
          SPI Fast Sequence Mode (FSM) Serial Flash Controller and support