diff options
author | Josh Boyer <jwboyer@redhat.com> | 2012-10-30 15:49:07 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@redhat.com> | 2012-10-30 15:49:07 -0400 |
commit | ede75f6f8f84592ab0a2440327a0dd92912171f7 (patch) | |
tree | c83b220c63c85d04820034ffda7fac25bdc60481 /config-powerpc64 | |
parent | 23aad7f77fd1d1fd894c77db19f057728acacb02 (diff) | |
download | kernel-ede75f6f8f84592ab0a2440327a0dd92912171f7.tar.gz kernel-ede75f6f8f84592ab0a2440327a0dd92912171f7.tar.xz kernel-ede75f6f8f84592ab0a2440327a0dd92912171f7.zip |
Update config options for 3.7
- Fix module blacklist patch to not leak a reference to the blacklist keyring
Diffstat (limited to 'config-powerpc64')
-rw-r--r-- | config-powerpc64 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config-powerpc64 b/config-powerpc64 index ccd0e85d4..f5a4898d4 100644 --- a/config-powerpc64 +++ b/config-powerpc64 @@ -165,7 +165,10 @@ CONFIG_IO_EVENT_IRQ=y CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_PSERIES=m -CONFIG_CRYPTO_DEV_NX=m +CONFIG_CRYPTO_DEV_NX=y +CONFIG_CRYPTO_842=m +CONFIG_CRYPTO_DEV_NX_ENCRYPT=m +CONFIG_CRYPTO_DEV_NX_COMPRESS=m CONFIG_BPF_JIT=y |