rk: revert 20f3d0b+v3.0.66 to v3.0

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

diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
index bfb3dc03c9de31a63db88876fa803df4d550aa84..6ae5ec50858744daed011d49041e89030e921d60 100644 (file)
--- 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 CRYPTO
        help
          Bluetooth is low-cost, low-power, short-range wireless technology.
          It was designed as a replacement for cables and other short-range
@@ -23,7 +22,6 @@ menuconfig BT
             BNEP Module (Bluetooth Network Encapsulation Protocol)
             CMTP Module (CAPI Message Transport Protocol)
             HIDP Module (Human Interface Device Protocol)
-            SMP Module (Security Manager Protocol)
 
          Say Y here to compile Bluetooth support into the kernel or say M to
          compile it as module (bluetooth).
@@ -38,18 +36,11 @@ if BT != n
 config BT_L2CAP
        bool "L2CAP protocol support"
        select CRC16
-       select CRYPTO
-       select CRYPTO_BLKCIPHER
-       select CRYPTO_AES
-       select CRYPTO_ECB
        help
          L2CAP (Logical Link Control and Adaptation Protocol) provides
          connection oriented and connection-less data transport.  L2CAP
          support is required for most Bluetooth applications.
 
-         Also included is support for SMP (Security Manager Protocol) which
-         is the security layer on top of LE (Low Energy) links.
-
 config BT_SCO
        bool "SCO links support"
        help