Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...

[firefly-linux-kernel-4.4.55.git] / drivers / bluetooth / Kconfig

diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index 0bd88c942a5202845960ddbf62b35e9d1aa9e9d2..c9c5dd0bad364e2f4850a33fd95ee90e19a80a18 100644 (file)
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -4,6 +4,7 @@ menu "Bluetooth device drivers"
 
 config BT_INTEL
        tristate
+       select REGMAP
 
 config BT_BCM
        tristate
@@ -183,6 +184,7 @@ config BT_HCIBCM203X
 config BT_HCIBPA10X
        tristate "HCI BPA10x USB driver"
        depends on USB
+       select BT_HCIUART_H4
        help
          Bluetooth HCI BPA10x USB driver.
          This driver provides support for the Digianswer BPA 100/105 Bluetooth
@@ -275,7 +277,7 @@ config BT_MRVL
          The core driver to support Marvell Bluetooth devices.
 
          This driver is required if you want to support
-         Marvell Bluetooth devices, such as 8688/8787/8797/8887/8897.
+         Marvell Bluetooth devices, such as 8688/8787/8797/8887/8897/8997.
 
          Say Y here to compile Marvell Bluetooth driver
          into the kernel or say M to compile it as module.
@@ -289,7 +291,7 @@ config BT_MRVL_SDIO
          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 SD8688/SD8787/SD8797/SD8887/SD8897
+         devices with SDIO interface. Currently SD8688/SD8787/SD8797/SD8887/SD8897/SD8997
          chipsets are supported.
 
          Say Y here to compile support for Marvell BT-over-SDIO driver