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

[safe/jmp/linux-2.6] / drivers / ssb / Kconfig

diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig
index 78fd331..b1b947e 100644 (file)
--- a/drivers/ssb/Kconfig
+++ b/drivers/ssb/Kconfig
@@ -1,10 +1,11 @@
-menu "Sonics Silicon Backplane"
-
 config SSB_POSSIBLE
        bool
-       depends on HAS_IOMEM
+       depends on HAS_IOMEM && HAS_DMA
        default y
 
+menu "Sonics Silicon Backplane"
+       depends on SSB_POSSIBLE
+
 config SSB
        tristate "Sonics Silicon Backplane support"
        depends on SSB_POSSIBLE
@@ -20,6 +21,15 @@ config SSB
 
          If unsure, say N.
 
+# Common SPROM support routines
+config SSB_SPROM
+       bool
+
+# Support for Block-I/O. SELECT this from the driver that needs it.
+config SSB_BLOCKIO
+       bool
+       depends on SSB
+
 config SSB_PCIHOST_POSSIBLE
        bool
        depends on SSB && (PCI = y || PCI = SSB)
@@ -28,6 +38,7 @@ config SSB_PCIHOST_POSSIBLE
 config SSB_PCIHOST
        bool "Support for SSB on PCI-bus host"
        depends on SSB_PCIHOST_POSSIBLE
+       select SSB_SPROM
        default y
        help
          Support for a Sonics Silicon Backplane on top
@@ -35,6 +46,11 @@ config SSB_PCIHOST
 
          If unsure, say Y
 
+config SSB_B43_PCI_BRIDGE
+       bool
+       depends on SSB_PCIHOST
+       default n
+
 config SSB_PCMCIAHOST_POSSIBLE
        bool
        depends on SSB && (PCMCIA = y || PCMCIA = SSB) && EXPERIMENTAL
@@ -43,6 +59,7 @@ config SSB_PCMCIAHOST_POSSIBLE
 config SSB_PCMCIAHOST
        bool "Support for SSB on PCMCIA-bus host (EXPERIMENTAL)"
        depends on SSB_PCMCIAHOST_POSSIBLE
+       select SSB_SPROM
        help
          Support for a Sonics Silicon Backplane on top
          of a PCMCIA device.
@@ -120,4 +137,13 @@ config SSB_DRIVER_EXTIF
 
          If unsure, say N
 
+config SSB_DRIVER_GIGE
+       bool "SSB Broadcom Gigabit Ethernet driver"
+       depends on SSB_PCIHOST_POSSIBLE && SSB_EMBEDDED && MIPS
+       help
+         Driver for the Sonics Silicon Backplane attached
+         Broadcom Gigabit Ethernet.
+
+         If unsure, say N
+
 endmenu