Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index 6bb2027d595e01076c41a0ec8c8ebabab8b7ea6d..68eff964e53b56ffbda97526f0d0344f2a9adf5e 100644 (file)
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -2,26 +2,6 @@
 menu "Bluetooth device drivers"
        depends on BT
 
-config BT_HCIUSB
-       tristate "HCI USB driver (old version)"
-       depends on USB && BT_HCIBTUSB=n
-       help
-         Bluetooth HCI USB driver.
-         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"
        depends on USB