Redo 9709 because CONFIG_SCSI_ACARD does cause FTBFS on arm.

svn path=/dists/trunk/linux-2.6/; revision=9711
2007-11-12 06:46:29 +00:00 · 2007-11-12 06:46:29 +00:00 · fa9b129ce0
parent 3be3e273e2
commit fa9b129ce0
2 changed files with 14 additions and 0 deletions
--- a/debian/patches/bugfix/arm/disable-scsi_acard.patch
+++ b/debian/patches/bugfix/arm/disable-scsi_acard.patch
@ -0,0 +1,13 @@
+diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
+index 6f2c71e..3fce8f4 100644
+--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
+@@ -378,7 +378,7 @@ config SCSI_7000FASST
+ 
+ config SCSI_ACARD
+ 	tristate "ACARD SCSI support"
+-	depends on PCI && SCSI
+	depends on PCI && SCSI && (!ARM || BROKEN)
+ 	help
+ 	  This driver supports the ACARD SCSI host adapter.
+ 	  Support Chip <ATP870 ATP876 ATP880 ATP885>
--- a/debian/patches/series/1~experimental.1
+++ b/debian/patches/series/1~experimental.1
@ -49,3 +49,4 @@
 + features/all/e1000e-20070806.patch
 + features/all/e1000e-fixes.patch
 + bugfix/all/2.6.23.1
+ bugfix/arm/disable-scsi_acard.patch