Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[cascardo/linux.git] / drivers / nvmem / Kconfig

diff --git a/drivers/nvmem/Kconfig b/drivers/nvmem/Kconfig
index ca52952..3041d48 100644 (file)
--- a/drivers/nvmem/Kconfig
+++ b/drivers/nvmem/Kconfig
@@ -1,6 +1,5 @@
 menuconfig NVMEM
        tristate "NVMEM Support"
-       select REGMAP
        help
          Support for NVMEM(Non Volatile Memory) devices like EEPROM, EFUSES...
 
@@ -28,6 +27,7 @@ config NVMEM_IMX_OCOTP
 config NVMEM_LPC18XX_EEPROM
        tristate "NXP LPC18XX EEPROM Memory Support"
        depends on ARCH_LPC18XX || COMPILE_TEST
+       depends on HAS_IOMEM
        help
          Say Y here to include support for NXP LPC18xx EEPROM memory found in
          NXP LPC185x/3x and LPC435x/3x/2x/1x devices.
@@ -49,6 +49,7 @@ config NVMEM_MXS_OCOTP
 config MTK_EFUSE
        tristate "Mediatek SoCs EFUSE support"
        depends on ARCH_MEDIATEK || COMPILE_TEST
+       depends on HAS_IOMEM
        select REGMAP_MMIO
        help
          This is a driver to access hardware related data like sensor
@@ -61,7 +62,6 @@ config QCOM_QFPROM
        tristate "QCOM QFPROM Support"
        depends on ARCH_QCOM || COMPILE_TEST
        depends on HAS_IOMEM
-       select REGMAP_MMIO
        help
          Say y here to enable QFPROM support. The QFPROM provides access
          functions for QFPROM data to rest of the drivers via nvmem interface.
@@ -83,7 +83,6 @@ config ROCKCHIP_EFUSE
 config NVMEM_SUNXI_SID
        tristate "Allwinner SoCs SID support"
        depends on ARCH_SUNXI
-       select REGMAP_MMIO
        help
          This is a driver for the 'security ID' available on various Allwinner
          devices.