Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi

[~andy/linux] / drivers / mtd / Kconfig

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 1be621841400f9c2221f433e0f5b13e02619cc40..5760c1a4b3f66ea3125b71d28ab4f62ceb4ee925 100644 (file)
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -1,6 +1,6 @@
 menuconfig MTD
        tristate "Memory Technology Device (MTD) support"
-       depends on HAS_IOMEM
+       depends on GENERIC_IO
        help
          Memory Technology Devices are flash, RAM and similar chips, often
          used for solid state file systems on embedded devices. This option
@@ -304,9 +304,6 @@ config MTD_OOPS
          buffer in a flash partition where it can be read back at some
          later point.
 
-         To use, add console=ttyMTDx to the kernel command line,
-         where x is the MTD device number to use.
-
 config MTD_SWAP
        tristate "Swap on MTD device support"
        depends on MTD && SWAP