[kernel] Cleanup - make crypto manager options match reality

[Chuck Ebbert]

commit 6b849f22a6c5faf9196930adf8415c303ba2175e
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Wed Jun 29 11:09:56 2011 -0400

    Cleanup - make crypto manager options match reality

 .gitignore     |    2 +-
 config-generic |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d5c87e0..2a45958 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@ linux-*.tar.bz2
 patch-*.bz2
 clog
 *.rpm
-kernel-3.*/
+kernel-[23].*/
diff --git a/config-generic b/config-generic
index 909fff2..c286c54 100644
--- a/config-generic
+++ b/config-generic
@@ -3858,12 +3858,11 @@ CONFIG_CRYPTO=y
 CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_USER_API_HASH=y
 CONFIG_CRYPTO_USER_API_SKCIPHER=y
-CONFIG_CRYPTO_MANAGER_TESTS=y
+CONFIG_CRYPTO_MANAGER=y
 # Note, CONFIG_CRYPTO_MANAGER_DISABLE_TESTS needs to be unset, or FIPS will be disabled.
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_MANAGER=m
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ARC4=m