i2c-scmi: Provide module aliases for automatic loading

[safe/jmp/linux-2.6] / drivers / bluetooth / Kconfig

diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index 77bded4..058fbcc 100644 (file)
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -2,7 +2,7 @@
 menu "Bluetooth device drivers"
        depends on BT
 
 menu "Bluetooth device drivers"
        depends on BT
 

-config BT_HCIUSB
+config BT_HCIBTUSB

        tristate "HCI USB driver"
        depends on USB
        help
        tristate "HCI USB driver"
        depends on USB
        help


@@ -11,16 +11,7 @@ config BT_HCIUSB
          USB interface.
 
          Say Y here to compile support for Bluetooth USB devices into the
          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.
+         kernel or say M to compile it as module (btusb).

 
 config BT_HCIBTSDIO
        tristate "HCI SDIO driver"
 
 config BT_HCIBTSDIO
        tristate "HCI SDIO driver"


@@ -58,6 +49,7 @@ config BT_HCIUART_H4
 config BT_HCIUART_BCSP
        bool "BCSP protocol support"
        depends on BT_HCIUART
 config BT_HCIUART_BCSP
        bool "BCSP protocol support"
        depends on BT_HCIUART

+       select BITREVERSE

        help
          BCSP (BlueCore Serial Protocol) is serial protocol for communication 
          between Bluetooth device and host. This protocol is required for non
        help
          BCSP (BlueCore Serial Protocol) is serial protocol for communication 
          between Bluetooth device and host. This protocol is required for non


@@ -178,5 +170,41 @@ 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).
 
          Say Y here to compile support for virtual HCI devices into the
          kernel or say M to compile it as module (hci_vhci).
 

-endmenu
+config BT_MRVL
+       tristate "Marvell Bluetooth driver support"
+       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.
+
+config BT_MRVL_SDIO
+       tristate "Marvell BT-over-SDIO driver"
+       depends on BT_MRVL && MMC
+       select FW_LOADER
+       help
+         The driver for Marvell Bluetooth chipsets with SDIO interface.
+
+         This driver is required if you want to use Marvell Bluetooth
+         devices with SDIO interface. Currently only SD8688 chipset is
+         supported.
+
+         Say Y here to compile support for Marvell BT-over-SDIO driver
+         into the kernel or say M to compile it as module.
+
+config BT_ATH3K
+       tristate "Atheros firmware download driver"
+       depends on BT_HCIBTUSB
+       select FW_LOADER
+       help
+         Bluetooth firmware download driver.
+         This driver loads the firmware into the Atheros Bluetooth
+         chipset.
+
+         Say Y here to compile support for "Atheros firmware download driver"
+         into the kernel or say M to compile it as module (ath3k).
+
+endmenu