summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth/Kconfig
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-05-30 23:26:45 -0700
committerDavid S. Miller <davem@davemloft.net>2015-05-30 23:26:45 -0700
commit9d52bf0a238657ebfddaf5976409ac33174b9f78 (patch)
tree4bab8453a145bdb38eaea6d83c2368d6a7f7ce2c /drivers/bluetooth/Kconfig
parent1dcf3ac49fb0079ed7d3d3f4a4cf25e9fb9fffc6 (diff)
parentb5a61c306b0dddb28e3a3ab5d782c73e5f665497 (diff)
downloadop-kernel-dev-9d52bf0a238657ebfddaf5976409ac33174b9f78.zip
op-kernel-dev-9d52bf0a238657ebfddaf5976409ac33174b9f78.tar.gz
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says: ==================== pull request: bluetooth-next 2015-05-28 Here's a set of patches intended for 4.2. The majority of the changes are on the 802.15.4 side of things rather than Bluetooth related: - All sorts of cleanups & fixes to ieee802154 and related drivers - Rework of tx power support in ieee802154 and its drivers - Support for setting ieee802154 tx power through nl802154 - New IDs for the btusb driver - Various cleanups & smaller fixes to btusb - New btrtl driver for Realtec devices - Fix suspend/resume for Realtek devices Please let me know if there are any issues pulling. Thanks. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/bluetooth/Kconfig')
-rw-r--r--drivers/bluetooth/Kconfig15
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index ed5c273..2e77707 100644
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -9,6 +9,10 @@ config BT_BCM
tristate
select FW_LOADER
+config BT_RTL
+ tristate
+ select FW_LOADER
+
config BT_HCIBTUSB
tristate "HCI USB driver"
depends on USB
@@ -32,6 +36,17 @@ config BT_HCIBTUSB_BCM
Say Y here to compile support for Broadcom protocol.
+config BT_HCIBTUSB_RTL
+ bool "Realtek protocol support"
+ depends on BT_HCIBTUSB
+ select BT_RTL
+ default y
+ help
+ The Realtek protocol support enables firmware and configuration
+ download support for Realtek Bluetooth controllers.
+
+ Say Y here to compile support for Realtek protocol.
+
config BT_HCIBTSDIO
tristate "HCI SDIO driver"
depends on MMC
OpenPOWER on IntegriCloud