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

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

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 3d8d2d83995fb8f15e28e43f403640a906e16e51..a3c4de551ebee12239c07738f9d9896a3b26060f 100644 (file)
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -246,6 +246,7 @@ config MTD_NAND_BCM_UMI_HWCS
 config MTD_NAND_DISKONCHIP
        tristate "DiskOnChip 2000, Millennium and Millennium Plus (NAND reimplementation) (EXPERIMENTAL)"
        depends on EXPERIMENTAL
+       depends on HAS_IOMEM
        select REED_SOLOMON
        select REED_SOLOMON_DEC16
        help
@@ -431,6 +432,7 @@ config MTD_NAND_GPMI_NAND
 
 config MTD_NAND_PLATFORM
        tristate "Support for generic platform NAND driver"
+       depends on HAS_IOMEM
        help
          This implements a generic NAND driver for on-SOC platform
          devices. You will need to provide platform-specific functions