aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-25 20:20:41 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-25 20:20:41 -0700
commit8c8a0eab988c94294adbbb4fe955bba7d8ebddcf (patch)
tree7af509b78594aeff7d6e076c806c84cc200686ed /drivers
parent8483ca3c99559027a3741af7f56f6b36887f7fd5 (diff)
parentbcbaecbb9968750d4bfb2686a97e396f681f88ef (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6: [CRYPTO] users: Select ECB/CBC where needed
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index e2ed24918a5..e38846eb51f 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2717,6 +2717,7 @@ config PPP_MPPE
select CRYPTO
select CRYPTO_SHA1
select CRYPTO_ARC4
+ select CRYPTO_ECB
---help---
Support for the MPPE Encryption protocol, as employed by the
Microsoft Point-to-Point Tunneling Protocol.