diff --git a/[refs] b/[refs] index 5cb36bd2e519..2016e63c6f7c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95b23582d796305c66952188de2f5159b28be766 +refs/heads/master: 53bf2426b4122d933213bba78bf736e88f7dc929 diff --git a/trunk/net/bluetooth/Kconfig b/trunk/net/bluetooth/Kconfig index 9ec85eb8853d..3537d385035e 100644 --- a/trunk/net/bluetooth/Kconfig +++ b/trunk/net/bluetooth/Kconfig @@ -29,7 +29,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).