diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-07-22 22:08:29 +0300 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-07-22 22:08:29 +0300 |
| commit | ae0008c71a192abe6f0fed7082d5e5b1cadfd4e7 (patch) | |
| tree | 2bef14ef257315aac5502a5d3f90a3417e938182 /net/bluetooth/Kconfig | |
| parent | 917d083d48f50537b21c8761e2366bf229ed9f5d (diff) | |
| parent | a006827a152c3f4d09324157096c8f89cf7ddca3 (diff) | |
| download | talos-op-linux-ae0008c71a192abe6f0fed7082d5e5b1cadfd4e7.tar.gz talos-op-linux-ae0008c71a192abe6f0fed7082d5e5b1cadfd4e7.zip | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'net/bluetooth/Kconfig')
| -rw-r--r-- | net/bluetooth/Kconfig | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig index 06ec14499ca1..600fb29288f4 100644 --- a/net/bluetooth/Kconfig +++ b/net/bluetooth/Kconfig @@ -6,7 +6,6 @@ menuconfig BT tristate "Bluetooth subsystem support" depends on NET && !S390 depends on RFKILL || !RFKILL - select 6LOWPAN_IPHC if BT_6LOWPAN select CRC16 select CRYPTO select CRYPTO_BLKCIPHER @@ -41,10 +40,10 @@ menuconfig BT more information, see <http://www.bluez.org/>. config BT_6LOWPAN - bool "Bluetooth 6LoWPAN support" - depends on BT && IPV6 + tristate "Bluetooth 6LoWPAN support" + depends on BT && 6LOWPAN help - IPv6 compression over Bluetooth. + IPv6 compression over Bluetooth Low Energy. source "net/bluetooth/rfcomm/Kconfig" |
