aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Michlmayr <tbm@cyrius.com>2006-11-19 14:22:09 +0000
committerMartin Michlmayr <tbm@cyrius.com>2006-11-19 14:22:09 +0000
commitf7f54590045fbc0fbbf5d1dcf99c99340b8ccb21 (patch)
treeb8842c04b27b117b1e1e85a01945c44625d33e16
parentbbeef77d40a288c4397127218448d8c0045af3e2 (diff)
downloadkernel_replicant_linux-f7f54590045fbc0fbbf5d1dcf99c99340b8ccb21.tar.gz
kernel_replicant_linux-f7f54590045fbc0fbbf5d1dcf99c99340b8ccb21.tar.bz2
kernel_replicant_linux-f7f54590045fbc0fbbf5d1dcf99c99340b8ccb21.zip
cobalt: unset CONFIG_SCSI_SYM53C8XX_2
svn path=/dists/sid/linux-2.6/; revision=7826
-rw-r--r--debian/arch/mipsel/config.r5k-cobalt6
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 5 deletions
diff --git a/debian/arch/mipsel/config.r5k-cobalt b/debian/arch/mipsel/config.r5k-cobalt
index 9c763ef2b109..26b3a0929b60 100644
--- a/debian/arch/mipsel/config.r5k-cobalt
+++ b/debian/arch/mipsel/config.r5k-cobalt
@@ -621,11 +621,7 @@ CONFIG_SCSI_INITIO=m
CONFIG_SCSI_INIA100=m
# CONFIG_SCSI_PPA is not set
# CONFIG_SCSI_IMM is not set
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
CONFIG_SCSI_IPR=m
# CONFIG_SCSI_IPR_TRACE is not set
# CONFIG_SCSI_IPR_DUMP is not set
diff --git a/debian/changelog b/debian/changelog
index f9a43f6c3347..e13e1fc4f7d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,8 @@ linux-2.6 (2.6.18-6) UNRELEASED; urgency=low
* arm/s3c2410: Unset CONFIG_PM_LEGACY.
* arm/versatile: Fix Versatile PCI config byte accesses
* arm/ixp4xx: Swap the disk 1 and disk 2 LED definitions so they're right.
+ * mipsel/r5k-cobalt: Unset CONFIG_SCSI_SYM53C8XX_2 because the timeout is
+ just too long.
[ dann frazier ]
* Backport various SCTP changesets from 2.6.19, recommended by Vlad Yasevich