hso: fix soft-lockup

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

diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index 71a58a4..652367a 100644 (file)
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -2,7 +2,7 @@
 menu "Bluetooth device drivers"
        depends on BT
 
-config BT_HCIUSB
+config BT_HCIBTUSB
        tristate "HCI USB driver"
        depends on USB
        help
@@ -11,28 +11,6 @@ config BT_HCIUSB
          USB interface.
 
          Say Y here to compile support for Bluetooth USB devices into the
-         kernel or say M to compile it as module (hci_usb).
-
-config BT_HCIUSB_SCO
-       bool "SCO (voice) support"
-       depends on BT_HCIUSB
-       help
-         This option enables the SCO support in the HCI USB driver. You need this
-         to transmit voice data with your Bluetooth USB device.
-
-         Say Y here to compile support for SCO over HCI USB.
-
-config BT_HCIBTUSB
-       tristate "HCI USB driver (alternate version)"
-       depends on USB && EXPERIMENTAL && BT_HCIUSB=n
-       help
-         Bluetooth HCI USB driver.
-         This driver is required if you want to use Bluetooth devices with
-         USB interface.
-
-          This driver is still experimental and has no SCO support.
-
-         Say Y here to compile support for Bluetooth USB devices into the
          kernel or say M to compile it as module (btusb).
 
 config BT_HCIBTSDIO
@@ -71,7 +49,7 @@ config BT_HCIUART_H4
 config BT_HCIUART_BCSP
        bool "BCSP protocol support"
        depends on BT_HCIUART
-       select CONFIG_BITREVERSE
+       select BITREVERSE
        help
          BCSP (BlueCore Serial Protocol) is serial protocol for communication 
          between Bluetooth device and host. This protocol is required for non
@@ -192,5 +170,30 @@ config BT_HCIVHCI
          Say Y here to compile support for virtual HCI devices into the
          kernel or say M to compile it as module (hci_vhci).
 
+config BT_MRVL
+       tristate "Marvell Bluetooth driver support"
+       help
+         The core driver to support Marvell Bluetooth devices.
+
+         This driver is required if you want to support
+         Marvell Bluetooth devices, such as 8688.
+
+         Say Y here to compile Marvell Bluetooth driver
+         into the kernel or say M to compile it as module.
+
+config BT_MRVL_SDIO
+       tristate "Marvell BT-over-SDIO driver"
+       depends on BT_MRVL && MMC
+       select FW_LOADER
+       help
+         The driver for Marvell Bluetooth chipsets with SDIO interface.
+
+         This driver is required if you want to use Marvell Bluetooth
+         devices with SDIO interface. Currently only SD8688 chipset is
+         supported.
+
+         Say Y here to compile support for Marvell BT-over-SDIO driver
+         into the kernel or say M to compile it as module.
+
 endmenu