Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[pandora-kernel.git] / drivers / mtd / maps / Kconfig

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 1b0d56c..8e0c4bf 100644 (file)
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -332,10 +332,6 @@ config MTD_SOLUTIONENGINE
          This enables access to the flash chips on the Hitachi SolutionEngine and
          similar boards. Say 'Y' if you are building a kernel for such a board.
 
-config MTD_ARM_INTEGRATOR
-       tristate "CFI Flash device mapped on ARM Integrator/P720T"
-       depends on ARM && MTD_CFI
-
 config MTD_CDB89712
        tristate "Cirrus CDB89712 evaluation board mappings"
        depends on MTD_CFI && ARCH_CDB89712