block: ensure jiffies wrap is handled correctly in blk_rq_timed_out_timer

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

diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig
index b1b947e..2d8cc45 100644 (file)
--- a/drivers/ssb/Kconfig
+++ b/drivers/ssb/Kconfig
@@ -53,11 +53,11 @@ config SSB_B43_PCI_BRIDGE
 
 config SSB_PCMCIAHOST_POSSIBLE
        bool
-       depends on SSB && (PCMCIA = y || PCMCIA = SSB) && 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
@@ -66,6 +66,20 @@ config SSB_PCMCIAHOST
 
          If unsure, say N
 
+config SSB_SDIOHOST_POSSIBLE
+       bool
+       depends on SSB && (MMC = y || MMC = SSB)
+       default y
+
+config SSB_SDIOHOST
+       bool "Support for SSB on SDIO-bus host"
+       depends on SSB_SDIOHOST_POSSIBLE
+       help
+         Support for a Sonics Silicon Backplane on top
+         of a SDIO device.
+
+         If unsure, say N
+
 config SSB_SILENT
        bool "No SSB kernel messages"
        depends on SSB && EMBEDDED
@@ -107,14 +121,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
@@ -129,8 +143,8 @@ config SSB_EMBEDDED
        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.