summaryrefslogtreecommitdiffstats
path: root/config-x86_64-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-05-21 22:17:04 -0400
committerJosh Boyer <jwboyer@redhat.com>2012-05-21 22:17:04 -0400
commitda90872924556bce070132e353b653e3ce88aa1a (patch)
treefcfdad8d4e04bbdddd2e3ebcba85bfbb14cbf8d8 /config-x86_64-generic
parent3dd0fcf0aa26baa4e8e02c7cd298616128c4b980 (diff)
downloadkernel-da90872924556bce070132e353b653e3ce88aa1a.tar.gz
kernel-da90872924556bce070132e353b653e3ce88aa1a.tar.xz
kernel-da90872924556bce070132e353b653e3ce88aa1a.zip
Update configs for first 3.5 merge window git snapshot
Diffstat (limited to 'config-x86_64-generic')
-rw-r--r--config-x86_64-generic2
1 files changed, 2 insertions, 0 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 49ed61771..6df21fed1 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -1,5 +1,6 @@
CONFIG_64BIT=y
+# CONFIG_X86_X32 is not set
# CONFIG_MK8 is not set
# CONFIG_MPSC is not set
CONFIG_GENERIC_CPU=y
@@ -44,6 +45,7 @@ CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
CONFIG_CRYPTO_SHA1_SSSE3=m
CONFIG_CRYPTO_BLOWFISH_X86_64=m
CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
+CONFIG_CRYPTO_CAMELLIA_X86_64=m
# CONFIG_I2C_ALI1535 is not set
# CONFIG_I2C_ALI1563 is not set