[kernel] r16889 - in dists/sid/linux-2.6/debian: . config/kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Tue Feb 15 03:36:01 2011
New Revision: 16889

Log:
[x86] crypto: Re-enable AES_NI_INTEL as module (Closes: #597658)

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-64

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Tue Feb 15 03:14:52 2011	(r16888)
+++ dists/sid/linux-2.6/debian/changelog	Tue Feb 15 03:36:01 2011	(r16889)
@@ -13,6 +13,7 @@
   * acer-wmi, aic94xx, asus_acpi, iscsi, janz-ican3, rtc-ds1511, tc1100-wmi:
     Restrict write permissions on files in procfs/sysfs
   * nbd: Remove module-level ioctl mutex mistakenly introduced in 2.6.37
+  * [x86] crypto: Re-enable AES_NI_INTEL as module (Closes: #597658)
 
   [ Aurelien Jarno ]
   * [sh4] Export cpu_core_map to fix build failure with CONFIG_SFC=m.

Modified: dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-64
==============================================================================
--- dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Tue Feb 15 03:14:52 2011	(r16888)
+++ dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Tue Feb 15 03:36:01 2011	(r16889)
@@ -36,7 +36,7 @@
 ## file: crypto/Kconfig
 ##
 CONFIG_CRYPTO_AES_X86_64=m
-# CONFIG_CRYPTO_AES_NI_INTEL is not set
+CONFIG_CRYPTO_AES_NI_INTEL=m
 CONFIG_CRYPTO_SALSA20_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64=m