git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[sfrench/cifs-2.6.git]
/
net
/
bluetooth
/
Kconfig
diff --git
a/net/bluetooth/Kconfig
b/net/bluetooth/Kconfig
index 3803135c88ff4ec851b474bf761d59ec315fbf69..165148c7c4ce5fe652886670b7aab433335a35ed 100644
(file)
--- a/
net/bluetooth/Kconfig
+++ b/
net/bluetooth/Kconfig
@@
-9,7
+9,7
@@
menuconfig BT
depends on RFKILL || !RFKILL
select CRC16
select CRYPTO
- select CRYPTO_
BL
KCIPHER
+ select CRYPTO_
S
KCIPHER
select CRYPTO_LIB_AES
imply CRYPTO_AES
select CRYPTO_CMAC