Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[cascardo/linux.git] / arch / cris / arch-v32 / drivers / Kconfig

diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig
index 4f22350..1d866d3 100644 (file)
--- a/arch/cris/arch-v32/drivers/Kconfig
+++ b/arch/cris/arch-v32/drivers/Kconfig
@@ -615,7 +615,6 @@ config ETRAX_PV_CHANGEABLE_BITS
 config ETRAX_CARDBUS
         bool "Cardbus support"
         depends on ETRAX_ARCH_V32
-        select HOTPLUG
         help
         Enabled the ETRAX Cardbus driver.
 
@@ -639,8 +638,6 @@ config ETRAX_STREAMCOPROC
          This option enables a driver for the stream co-processor
          for cryptographic operations.
 
-source drivers/mmc/Kconfig
-
 config ETRAX_MMC_IOP
        tristate "MMC/SD host driver using IO-processor"
        depends on ETRAX_ARCH_V32 && MMC
@@ -832,9 +829,4 @@ config ETRAX_SPI_MMC_WP_GPIO_PIN
          The pin to use for the SD/MMC write-protect signal for a memory
          card.  If defined as " " (space), the card is considered writable.
 
-# Avoid choices causing non-working configs by conditionalizing the inclusion.
-if ETRAX_SPI_MMC
-source drivers/spi/Kconfig
-endif
-
 endif