summaryrefslogtreecommitdiffstats
path: root/config-x86_64-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-05-03 08:27:34 -0400
committerJosh Boyer <jwboyer@redhat.com>2013-05-03 13:32:30 -0400
commitdeb816ab2a9e56c61f86b5fd641185ea2fd4fbc0 (patch)
treeb3c6f07375b0eedf0f6a790c4d678ba8a02b600e /config-x86_64-generic
parent94a5a8a2cbbfd22a31cb68d52661ad80ec9d2bb2 (diff)
downloadkernel-deb816ab2a9e56c61f86b5fd641185ea2fd4fbc0.tar.gz
kernel-deb816ab2a9e56c61f86b5fd641185ea2fd4fbc0.tar.xz
kernel-deb816ab2a9e56c61f86b5fd641185ea2fd4fbc0.zip
Linux v3.9-8933-gce85722
- First DRM merge
Diffstat (limited to 'config-x86_64-generic')
-rw-r--r--config-x86_64-generic10
1 files changed, 8 insertions, 2 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 92f283073..5b6b32b47 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -34,7 +34,7 @@ CONFIG_TRANSPARENT_HUGEPAGE=y
CONFIG_KEXEC_JUMP=y
CONFIG_ACPI_BLACKLIST_YEAR=0
-CONFIG_ACPI_HOTPLUG_MEMORY=m
+CONFIG_ACPI_HOTPLUG_MEMORY=y
# CONFIG_INTEL_SCU_IPC is not set
@@ -47,14 +47,20 @@ CONFIG_CRYPTO_TWOFISH_X86_64=m
CONFIG_CRYPTO_SALSA20_X86_64=m
CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
CONFIG_CRYPTO_SHA1_SSSE3=m
+CONFIG_CRYPTO_SHA256_SSSE3=m
+CONFIG_CRYPTO_SHA512_SSSE3=m
CONFIG_CRYPTO_BLOWFISH_X86_64=m
+CONFIG_CRYPTO_BLOWFISH_AVX2_X86_64=m
CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
CONFIG_CRYPTO_CAMELLIA_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
CONFIG_CRYPTO_CAST5_AVX_X86_64=m
CONFIG_CRYPTO_CAST6_AVX_X86_64=m
CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_TWOFISH_AVX2_X86_64=m
# CONFIG_I2C_ALI1535 is not set
# CONFIG_I2C_ALI1563 is not set