[kernel] r14755 - in dists/trunk/linux-2.6/debian: . config

[Moritz Muehlenhoff]

Author: jmm
Date: Mon Dec  7 22:45:32 2009
New Revision: 14755

Log:
disable cryptoloop

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Dec  6 20:36:12 2009	(r14754)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Dec  7 22:45:32 2009	(r14755)
@@ -1,8 +1,12 @@
 linux-2.6 (2.6.32-2) UNRELEASED; urgency=low
 
+  [ Bastian Blank ]
   * Allow memory hot-add and -remove if possible.
   * Enable USB suspend.
 
+  [ Moritz Muehlenhoff ]
+  * Disable cryptoloop (Closes: #559755)
+
  -- Bastian Blank <waldi at debian.org>  Sun, 06 Dec 2009 20:42:14 +0100
 
 linux-2.6 (2.6.32-1) unstable; urgency=low

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Sun Dec  6 20:36:12 2009	(r14754)
+++ dists/trunk/linux-2.6/debian/config/config	Mon Dec  7 22:45:32 2009	(r14755)
@@ -183,7 +183,7 @@
 ##
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_CRYPTOLOOP=m
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_OSD=m
 CONFIG_BLK_DEV_RAM=m