Merge branch 'x86/urgent' into x86/cleanups

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

diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index a235ca787465f5bb0d310fd4211635492f43dc26..7cb4029a5375a774ed9c0cc888284d37330b1b17 100644 (file)
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -3,8 +3,8 @@ menu "Bluetooth device drivers"
        depends on BT
 
 config BT_HCIUSB
        depends on BT
 
 config BT_HCIUSB

-       tristate "HCI USB driver"
-       depends on USB
+       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
        help
          Bluetooth HCI USB driver.
          This driver is required if you want to use Bluetooth devices with


@@ -23,15 +23,13 @@ config BT_HCIUSB_SCO
          Say Y here to compile support for SCO over HCI USB.
 
 config BT_HCIBTUSB
          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
+       tristate "HCI USB driver"
+       depends on USB

        help
          Bluetooth HCI USB driver.
          This driver is required if you want to use Bluetooth devices with
          USB interface.
 
        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).
 
          Say Y here to compile support for Bluetooth USB devices into the
          kernel or say M to compile it as module (btusb).