From 99a61db48930160657af3cd54d6f1bdc6eaaf577 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Mon, 30 Mar 2009 12:42:42 +0000 Subject: [PATCH] sparc: enable BLK_DEV_CRYPTOLOOP sparc has no business overriding topconfig changes again, thus nuke dup definitions. open 2.6.30 trunk work. svn path=/dists/trunk/linux-2.6/; revision=13297 --- debian/changelog | 6 ++++++ debian/config/sparc/config.sparc64 | 2 -- debian/config/sparc/config.sparc64-smp | 2 -- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6aba23dad..a11a4da1f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Mon, 30 Mar 2009 14:40:26 +0200 + linux-2.6 (2.6.29-1~experimental.1) UNRELEASED; urgency=low * New upstream release diff --git a/debian/config/sparc/config.sparc64 b/debian/config/sparc/config.sparc64 index c2e63b2d3..d4c56b397 100644 --- a/debian/config/sparc/config.sparc64 +++ b/debian/config/sparc/config.sparc64 @@ -12,8 +12,6 @@ CONFIG_SPARC64_PAGE_SIZE_8KB=y ## 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 diff --git a/debian/config/sparc/config.sparc64-smp b/debian/config/sparc/config.sparc64-smp index abbd9d022..e77beb3b4 100644 --- a/debian/config/sparc/config.sparc64-smp +++ b/debian/config/sparc/config.sparc64-smp @@ -14,8 +14,6 @@ CONFIG_SCHED_SMT=y ## 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