Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

[pandora-kernel.git] / arch / cris / arch-v32 / drivers / Kconfig

diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig
index 471c203..7a64fce 100644 (file)
--- a/arch/cris/arch-v32/drivers/Kconfig
+++ b/arch/cris/arch-v32/drivers/Kconfig
@@ -378,22 +378,6 @@ config ETRAX_RS485_DISABLE_RECEIVER
          It is necessary to disable the serial receiver to avoid serial
          loopback.  Not all products are able to do this in software only.
 
-config ETRAX_AXISFLASHMAP
-       bool "Axis flash-map support"
-       depends on ETRAX_ARCH_V32
-       select MTD
-       select MTD_CFI
-       select MTD_CFI_AMDSTD
-       select MTD_JEDECPROBE
-       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_SYNCHRONOUS_SERIAL
        bool "Synchronous serial-port support"
        depends on ETRAX_ARCH_V32
@@ -497,12 +481,6 @@ config ETRAX_V32_I2C_CLK_PORT
        help
          The pin to use for I2C clock.
 
-config ETRAX_RTC
-       bool "Real Time Clock support"
-       depends on ETRAX_ARCH_V32 && ETRAX_I2C
-       help
-         Enabled RTC support.
-
 config ETRAX_GPIO
        bool "GPIO support"
        depends on ETRAX_ARCH_V32
@@ -663,6 +641,7 @@ config PCI
        bool
        depends on ETRAX_CARDBUS
        default y
+       select HAVE_GENERIC_DMA_COHERENT
 
 config ETRAX_IOP_FW_LOAD
        tristate "IO-processor hotplug firmware loading support"