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

[Maximilian Attems]

Author: maks
Date: Mon Mar 30 12:42:42 2009
New Revision: 13297

Log:
sparc: enable BLK_DEV_CRYPTOLOOP

sparc has no business overriding topconfig changes again,
thus nuke dup definitions.

open 2.6.30 trunk work.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/sparc/config.sparc64
   dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Mar 30 12:42:42 2009
@@ -1,3 +1,9 @@
+linux-2.6 (2.6.29-1~experimental.2) UNRELEASED; urgency=low
+
+  * [sparc] Enable BLK_DEV_CRYPTOLOOP. (closes: #521829)
+
+ -- maximilian attems <maks at debian.org>  Mon, 30 Mar 2009 14:40:26 +0200
+
 linux-2.6 (2.6.29-1~experimental.1) UNRELEASED; urgency=low
 
   * New upstream release

Modified: dists/trunk/linux-2.6/debian/config/sparc/config.sparc64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config.sparc64	(original)
+++ dists/trunk/linux-2.6/debian/config/sparc/config.sparc64	Mon Mar 30 12:42:42 2009
@@ -12,8 +12,6 @@
 ## file: drivers/block/Kconfig
 ##
 # CONFIG_PARIDE is not set
-CONFIG_BLK_DEV_LOOP=y
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM_SIZE=16384

Modified: dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp	(original)
+++ dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp	Mon Mar 30 12:42:42 2009
@@ -14,8 +14,6 @@
 ## file: drivers/block/Kconfig
 ##
 # CONFIG_PARIDE is not set
-CONFIG_BLK_DEV_LOOP=y
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM_SIZE=16384