Merge tag 'asoc-v3.16-rc1' into asoc-linus

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

diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
index 985b56070d2608c0e24965aa0c77d7b24498509a..06ec14499ca129d2e5b8833a01b7530bc829802d 100644 (file)
--- a/net/bluetooth/Kconfig
+++ b/net/bluetooth/Kconfig
@@ -6,13 +6,13 @@ 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
        select CRYPTO_AES
        select CRYPTO_ECB
        select CRYPTO_SHA256
-       select 6LOWPAN_IPHC
        help
          Bluetooth is low-cost, low-power, short-range wireless technology.
          It was designed as a replacement for cables and other short-range
@@ -40,6 +40,12 @@ menuconfig BT
          to Bluetooth kernel modules are provided in the BlueZ packages.  For
          more information, see <http://www.bluez.org/>.
 
+config BT_6LOWPAN
+       bool "Bluetooth 6LoWPAN support"
+       depends on BT && IPV6
+       help
+         IPv6 compression over Bluetooth.
+
 source "net/bluetooth/rfcomm/Kconfig"
 
 source "net/bluetooth/bnep/Kconfig"