diff --git a/debian/changelog b/debian/changelog index 7bcc10b74..c37e92963 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Sun, 06 Dec 2009 20:42:14 +0100 linux-2.6 (2.6.32-1) unstable; urgency=low diff --git a/debian/config/config b/debian/config/config index f5b186fc4..c5112d495 100644 --- a/debian/config/config +++ b/debian/config/config @@ -183,7 +183,7 @@ CONFIG_EXTRA_FIRMWARE="" ## 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