Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[mv-sheeva.git] / arch / cris / arch-v10 / drivers / Kconfig

diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig
index 42a6d2ed6523d0a217b365829f73418385b3f74f..58f5864a668057ff57e5c62c29a64e7d4103ab18 100644 (file)
--- a/arch/cris/arch-v10/drivers/Kconfig
+++ b/arch/cris/arch-v10/drivers/Kconfig
@@ -428,21 +428,6 @@ config ETRAX_USB_HOST_PORT2
        depends on ETRAX_USB_HOST
        default n
 
-config ETRAX_AXISFLASHMAP
-       bool "Axis flash-map support"
-       depends on ETRAX_ARCH_V10
-       select MTD
-       select MTD_CFI
-       select MTD_CFI_AMDSTD
-       select MTD_CHAR
-       select MTD_BLOCK
-       select MTD_PARTITIONS
-       select MTD_CONCAT
-       select MTD_COMPLEX_MAPPINGS
-       help
-         This option enables MTD mapping of flash devices.  Needed to use
-         flash memories.  If unsure, say Y.
-
 config ETRAX_PTABLE_SECTOR
        int "Byte-offset of partition table sector"
        depends on ETRAX_AXISFLASHMAP