diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-22 20:10:23 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-22 20:10:23 -0400 |
| commit | 28eb177dfa5982d132edceed891cb3885df258bb (patch) | |
| tree | 5f8fdc37ad1d8d0793e9c47da7d908b97c814ffb /net/ipv4/Kconfig | |
| parent | fd8ae94eea9bb4269d6dff1b47b9dc741bd70d0b (diff) | |
| parent | db392219c5f572610645696e3672f6ea38783a65 (diff) | |
Merge branch 'master' into upstream
Conflicts:
net/ieee80211/ieee80211_crypt_tkip.c
net/ieee80211/ieee80211_crypt_wep.c
Diffstat (limited to 'net/ipv4/Kconfig')
| -rw-r--r-- | net/ipv4/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index 8514106761b0..3b5d504a74be 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig | |||
| @@ -386,6 +386,7 @@ config INET_ESP | |||
| 386 | select CRYPTO | 386 | select CRYPTO |
| 387 | select CRYPTO_HMAC | 387 | select CRYPTO_HMAC |
| 388 | select CRYPTO_MD5 | 388 | select CRYPTO_MD5 |
| 389 | select CRYPTO_CBC | ||
| 389 | select CRYPTO_SHA1 | 390 | select CRYPTO_SHA1 |
| 390 | select CRYPTO_DES | 391 | select CRYPTO_DES |
| 391 | ---help--- | 392 | ---help--- |