Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

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

diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig
index b4a5e5e..540a294 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,14 +21,24 @@ 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
+       depends on SSB && (PCI = y || PCI = SSB)
        default y
 
 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,14 +46,20 @@ 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 && EXPERIMENTAL
+       depends on SSB && (PCMCIA = y || PCMCIA = SSB)
        default y
 
 config SSB_PCMCIAHOST
-       bool "Support for SSB on PCMCIA-bus host (EXPERIMENTAL)"
+       bool "Support for SSB on PCMCIA-bus host"
        depends on SSB_PCMCIAHOST_POSSIBLE
+       select SSB_SPROM
        help
          Support for a Sonics Silicon Backplane on top
          of a PCMCIA device.
@@ -90,14 +107,14 @@ config SSB_DRIVER_PCICORE
          If unsure, say Y
 
 config SSB_PCICORE_HOSTMODE
-       bool "Hostmode support for SSB PCI core (EXPERIMENTAL)"
-       depends on SSB_DRIVER_PCICORE && SSB_DRIVER_MIPS && EXPERIMENTAL
+       bool "Hostmode support for SSB PCI core"
+       depends on SSB_DRIVER_PCICORE && SSB_DRIVER_MIPS
        help
          PCIcore hostmode operation (external PCI bus).
 
 config SSB_DRIVER_MIPS
-       bool "SSB Broadcom MIPS core driver (EXPERIMENTAL)"
-       depends on SSB && MIPS && EXPERIMENTAL
+       bool "SSB Broadcom MIPS core driver"
+       depends on SSB && MIPS
        select SSB_SERIAL
        help
          Driver for the Sonics Silicon Backplane attached
@@ -105,13 +122,28 @@ config SSB_DRIVER_MIPS
 
          If unsure, say N
 
+# Assumption: We are on embedded, if we compile the MIPS core.
+config SSB_EMBEDDED
+       bool
+       depends on SSB_DRIVER_MIPS
+       default y
+
 config SSB_DRIVER_EXTIF
-       bool "SSB Broadcom EXTIF core driver (EXPERIMENTAL)"
-       depends on SSB_DRIVER_MIPS && EXPERIMENTAL
+       bool "SSB Broadcom EXTIF core driver"
+       depends on SSB_DRIVER_MIPS
        help
          Driver for the Sonics Silicon Backplane attached
          Broadcom EXTIF core.
 
          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