From da90872924556bce070132e353b653e3ce88aa1a Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@redhat.com>
Date: Mon, 21 May 2012 22:17:04 -0400
Subject: Update configs for first 3.5 merge window git snapshot

---
 config-x86_64-generic | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config-x86_64-generic')

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
-- 
cgit