Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / bluetooth / Kconfig

diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index 543f93e0f23f685c971fa775bdea727991192b86..a235ca787465f5bb0d310fd4211635492f43dc26 100644 (file)
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -22,6 +22,30 @@ config BT_HCIUSB_SCO
 
          Say Y here to compile support for SCO over HCI USB.
 
 
          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
+       tristate "HCI SDIO driver"
+       depends on MMC
+       help
+         Bluetooth HCI SDIO driver.
+         This driver is required if you want to use Bluetooth device with
+         SDIO interface.
+
+         Say Y here to compile support for Bluetooth SDIO devices into the
+         kernel or say M to compile it as module (btsdio).
+

 config BT_HCIUART
        tristate "HCI UART driver"
        help
 config BT_HCIUART
        tristate "HCI UART driver"
        help


@@ -47,6 +71,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


@@ -55,13 +80,16 @@ config BT_HCIUART_BCSP
 
          Say Y here to compile support for HCI BCSP protocol.
 
 
          Say Y here to compile support for HCI BCSP protocol.
 

-config BT_HCIUART_BCSP_TXCRC
-       bool "Transmit CRC with every BCSP packet"
-       depends on BT_HCIUART_BCSP
+config BT_HCIUART_LL
+       bool "HCILL protocol support"
+       depends on BT_HCIUART

        help
        help

-         If you say Y here, a 16-bit CRC checksum will be transmitted along with
-         every BCSP (BlueCore Serial Protocol) packet sent to the Bluetooth chip.
-         This increases reliability, but slightly reduces efficiency.
+         HCILL (HCI Low Level) is a serial protocol for communication
+         between Bluetooth device and host. This protocol is required for
+         serial Bluetooth devices that are based on Texas Instruments'
+         BRF chips.
+
+         Say Y here to compile support for HCILL protocol.

 
 config BT_HCIBCM203X
        tristate "HCI BCM203x USB driver"
 
 config BT_HCIBCM203X
        tristate "HCI BCM203x USB driver"