X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=drivers%2Fbluetooth%2FKconfig;h=b049a79fcc025d6c35a63393b5a24947b7403f5a;hb=132ff4e5fa8dfb71a7d99902f88043113947e972;hp=a235ca787465f5bb0d310fd4211635492f43dc26;hpb=d3a8eab093aab9f309d2e8d06cd718a4cb20e626;p=safe%2Fjmp%2Flinux-2.6

diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index a235ca7..b049a79 100644
--- 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,28 +11,6 @@ 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.
-
-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).
 
 config BT_HCIBTSDIO
@@ -192,5 +170,17 @@ config BT_HCIVHCI
 	  Say Y here to compile support for virtual HCI devices into the
 	  kernel or say M to compile it as module (hci_vhci).
 
+config BT_MRVL
+	tristate "Marvell Bluetooth driver support"
+	select FW_LOADER
+	help
+	  The core driver to support Marvell Bluetooth devices.
+
+	  This driver is required if you want to support
+	  Marvell Bluetooth devices, such as 8688.
+
+	  Say Y here to compile Marvell Bluetooth driver
+	  into the kernel or say M to compile it as module.
+
 endmenu