summaryrefslogtreecommitdiffstats
path: root/config-x86_64-generic
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2010-09-27 12:56:57 -0400
committerDave Jones <davej@redhat.com>2010-09-27 12:56:57 -0400
commit8de676ae56bdf729ce7403cb8750c3c73c2dd3da (patch)
treef62b99f9b94a184b6c4fd9db0bb18ea08385965e /config-x86_64-generic
parent900d3ab8595771a8aea20c8e40a3c01b18716981 (diff)
downloadkernel-8de676ae56bdf729ce7403cb8750c3c73c2dd3da.tar.gz
kernel-8de676ae56bdf729ce7403cb8750c3c73c2dd3da.tar.xz
kernel-8de676ae56bdf729ce7403cb8750c3c73c2dd3da.zip
These overrides are pointless, as the _X86_64 options SELECT them.
Diffstat (limited to 'config-x86_64-generic')
-rw-r--r--config-x86_64-generic6
1 files changed, 2 insertions, 4 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 27e242128..713c7ef17 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -153,13 +153,11 @@ CONFIG_BLK_DEV_AMD74XX=y
CONFIG_CRYPTO_DEV_PADLOCK=m
CONFIG_CRYPTO_DEV_PADLOCK_AES=m
CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-# CONFIG_CRYPTO_AES is not set
+
CONFIG_CRYPTO_AES_X86_64=m
-# CONFIG_CRYPTO_TWOFISH is not set
+CONFIG_CRYPTO_AES_NI_INTEL=m
CONFIG_CRYPTO_TWOFISH_X86_64=m
-# CONFIG_CRYPTO_SALSA20 is not set
CONFIG_CRYPTO_SALSA20_X86_64=m
-CONFIG_CRYPTO_AES_NI_INTEL=m
CONFIG_X86_MCE=y
CONFIG_X86_MCE_INTEL=y