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 7cb4029a5375a774ed9c0cc888284d37330b1b17..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
@@ -181,6 +161,27 @@ config BT_HCIBTUART
          Say Y here to compile support for HCI UART devices into the
          kernel or say M to compile it as module (btuart_cs).
 
+config BT_HCIBRF6150
+       tristate "HCI TI BRF6150 driver with H4 extensions"
+       depends on BT && ARCH_OMAP
+       help
+         Bluetooth HCI driver for TI BRF6150 with H4 extensions.
+         This driver provides support for BRF6150 Bluetooth chip 
+         with vendor-specific H4 extensions.
+
+         Say Y here to compile support for TI BRF6150 devices into the
+         kernel or say M to compile it as module (brf6150).
+
+config BT_HCIH4P
+       tristate "HCI driver with H4 Nokia extensions"
+       depends on BT && ARCH_OMAP 
+       help 
+         Bluetooth HCI driver with H4 extensions.  This driver provides
+         support for H4+ Bluetooth chip with vendor-specific H4 extensions.
+
+         Say Y here to compile support for h4 extended devices into the kernel
+         or say M to compile it as module (hci_h4p).
+
 config BT_HCIVHCI
        tristate "HCI VHCI (Virtual HCI device) driver"
        help