Merge branch 'docs' of git://git.lwn.net/linux-2.6

[linux-2.6] / drivers / ssb / Kconfig

diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig
index b4a5e5e..adea792 100644 (file)
--- a/drivers/ssb/Kconfig
+++ b/drivers/ssb/Kconfig
@@ -22,7 +22,7 @@ config SSB
 
 config SSB_PCIHOST_POSSIBLE
        bool
-       depends on SSB && PCI
+       depends on SSB && (PCI = y || PCI = SSB)
        default y
 
 config SSB_PCIHOST
@@ -35,9 +35,14 @@ 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) && EXPERIMENTAL
        default y
 
 config SSB_PCMCIAHOST
@@ -105,6 +110,12 @@ 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