aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Michlmayr <tbm@cyrius.com>2006-08-11 20:57:43 +0000
committerMartin Michlmayr <tbm@cyrius.com>2006-08-11 20:57:43 +0000
commit5613e26613dd0b742691082445ef05f4e1d46086 (patch)
tree82ed0bc8d4b31579b708e32323f5b0749f957c31
parent7a59d71026a3b34acb94b23bf2a764f0c87cde52 (diff)
downloadkernel_replicant_linux-5613e26613dd0b742691082445ef05f4e1d46086.tar.gz
kernel_replicant_linux-5613e26613dd0b742691082445ef05f4e1d46086.tar.bz2
kernel_replicant_linux-5613e26613dd0b742691082445ef05f4e1d46086.zip
Enable CONFIG_BLK_DEV_OFFBOARD.
svn path=/dists/sid/linux-2.6/; revision=7138
-rw-r--r--debian/arch/arm/config.iop32x2
-rw-r--r--debian/changelog7
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/arch/arm/config.iop32x b/debian/arch/arm/config.iop32x
index 2e97843041f0..2730ff88aea3 100644
--- a/debian/arch/arm/config.iop32x
+++ b/debian/arch/arm/config.iop32x
@@ -662,7 +662,7 @@ CONFIG_BLK_DEV_IDESCSI=m
CONFIG_IDE_GENERIC=y
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_IDEPCI_SHARE_IRQ=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
+CONFIG_BLK_DEV_OFFBOARD=y
CONFIG_BLK_DEV_GENERIC=m
CONFIG_BLK_DEV_OPTI621=m
CONFIG_BLK_DEV_SL82C105=m
diff --git a/debian/changelog b/debian/changelog
index da4ea6d9693b..f6cbce1e8158 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.17-7) UNRELEASED; urgency=low
+
+ [ Martin Michlmayr ]
+ * arm/iop32x: Enable CONFIG_BLK_DEV_OFFBOARD.
+
+ -- Martin Michlmayr <tbm@cyrius.com> Fri, 11 Aug 2006 22:49:46 +0200
+
linux-2.6 (2.6.17-6) unstable; urgency=low
[ maximilian attems ]