Merge branch 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86

[deliverable/linux.git] / drivers / bcma / Kconfig

diff --git a/drivers/bcma/Kconfig b/drivers/bcma/Kconfig
index fb7c80fb721e2466d405deedc367967179ea1d80..06b3207adebdcec34d75a9bcc352343cad73fd8d 100644 (file)
--- a/drivers/bcma/Kconfig
+++ b/drivers/bcma/Kconfig
@@ -46,6 +46,25 @@ config BCMA_DRIVER_MIPS
 
          If unsure, say N
 
+config BCMA_SFLASH
+       bool
+       depends on BCMA_DRIVER_MIPS && BROKEN
+       default y
+
+config BCMA_NFLASH
+       bool
+       depends on BCMA_DRIVER_MIPS && BROKEN
+       default y
+
+config BCMA_DRIVER_GMAC_CMN
+       bool "BCMA Broadcom GBIT MAC COMMON core driver"
+       depends on BCMA
+       help
+         Driver for the Broadcom GBIT MAC COMMON core attached to Broadcom
+         specific Advanced Microcontroller Bus.
+
+         If unsure, say N
+
 config BCMA_DEBUG
        bool "BCMA debugging"
        depends on BCMA