ath9k: prevent sleeping while we are waiting for CAB

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

diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index 77bded4..1164837 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,16 +11,7 @@ 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.
+         kernel or say M to compile it as module (btusb).
 
 config BT_HCIBTSDIO
        tristate "HCI SDIO driver"
@@ -58,6 +49,7 @@ config BT_HCIUART_H4
 config BT_HCIUART_BCSP
        bool "BCSP protocol support"
        depends on BT_HCIUART
+       select BITREVERSE
        help
          BCSP (BlueCore Serial Protocol) is serial protocol for communication 
          between Bluetooth device and host. This protocol is required for non