Merge branch 'next' into for-linus

[linux-2.6-omap-h63xx.git] / drivers / bluetooth / Kconfig

diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index a235ca787465f5bb0d310fd4211635492f43dc26..1164837bb781470730768c37f466a17f091095d3 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
@@ -10,28 +10,6 @@ config BT_HCIUSB
          This driver is required if you want to use Bluetooth devices with
          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).