[PATCH 2/3] UBUNTU: [Config] CONFIG_SCSI_SYM53C8XX_2=y for server and virtual flavours

Tim Gardner tim.gardner at canonical.com
Thu Jan 21 14:52:48 GMT 2010


BugLink: http://bugs.launchpad.net/bugs/494565

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 .../abi/2.6.32-10.14/amd64/server.modules          |    2 --
 debian.master/config/amd64/config.flavour.generic  |    2 ++
 debian.master/config/amd64/config.flavour.server   |    2 ++
 debian.master/config/armel/config.common.armel     |    1 +
 debian.master/config/config.common.ubuntu          |    2 --
 debian.master/config/i386/config.common.i386       |    2 ++
 debian.master/config/lpia/config.common.lpia       |    2 ++
 debian.master/sub-flavours/virtual.list            |    1 -
 8 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian.master/abi/2.6.32-10.14/amd64/server.modules b/debian.master/abi/2.6.32-10.14/amd64/server.modules
index 00e6b6d..6c01ed4 100644
--- a/debian.master/abi/2.6.32-10.14/amd64/server.modules
+++ b/debian.master/abi/2.6.32-10.14/amd64/server.modules
@@ -1699,7 +1699,6 @@ scsi_tgt
 scsi_transport_fc
 scsi_transport_iscsi
 scsi_transport_sas
-scsi_transport_spi
 scsi_transport_srp
 scsi_wait_scan
 sctp
@@ -1999,7 +1998,6 @@ svcrdma
 svgalib
 sx8
 sym53c500_cs
-sym53c8xx
 symbolserial
 synaptics_i2c
 synclink
diff --git a/debian.master/config/amd64/config.flavour.generic b/debian.master/config/amd64/config.flavour.generic
index e655718..d417095 100644
--- a/debian.master/config/amd64/config.flavour.generic
+++ b/debian.master/config/amd64/config.flavour.generic
@@ -7,3 +7,5 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 # CONFIG_MEMORY_HOTPLUG is not set
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_SYM53C8XX_2=m
diff --git a/debian.master/config/amd64/config.flavour.server b/debian.master/config/amd64/config.flavour.server
index 6b4b976..f3543b0 100644
--- a/debian.master/config/amd64/config.flavour.server
+++ b/debian.master/config/amd64/config.flavour.server
@@ -7,3 +7,5 @@ CONFIG_DEFAULT_IOSCHED="deadline"
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_SCSI_SPI_ATTRS=y
+CONFIG_SCSI_SYM53C8XX_2=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 4408ce4..47e9a2f 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -187,6 +187,7 @@ CONFIG_RCU_FANOUT=32
 # CONFIG_RTC_CLASS is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_SCSI_OSD_INITIATOR is not set
+CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SERIAL_8250=m
 CONFIG_SERIAL_8250_NR_UARTS=4
 # CONFIG_SERIAL_NONSTANDARD is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index ea1eac7..6f14fd7 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3137,13 +3137,11 @@ CONFIG_SCSI_SAS_LIBSAS=m
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_SCSI_SIM710=m
-CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_SRP=m
 CONFIG_SCSI_SRP_ATTRS=m
 CONFIG_SCSI_SRP_TGT_ATTRS=y
 CONFIG_SCSI_STEX=m
 CONFIG_SCSI_SYM53C416=m
-CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index f3f5b95..996d94f 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -207,6 +207,8 @@ CONFIG_RTC_CLASS=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_SATA_SX4=m
 CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_NR_UARTS=48
 CONFIG_SERIAL_NONSTANDARD=y
diff --git a/debian.master/config/lpia/config.common.lpia b/debian.master/config/lpia/config.common.lpia
index 7374bba..54f8a31 100644
--- a/debian.master/config/lpia/config.common.lpia
+++ b/debian.master/config/lpia/config.common.lpia
@@ -216,6 +216,8 @@ CONFIG_RTC_CLASS=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_SATA_SX4=m
 CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_NR_UARTS=48
 CONFIG_SERIAL_NONSTANDARD=y
diff --git a/debian.master/sub-flavours/virtual.list b/debian.master/sub-flavours/virtual.list
index 347bfce..aca70b1 100644
--- a/debian.master/sub-flavours/virtual.list
+++ b/debian.master/sub-flavours/virtual.list
@@ -77,7 +77,6 @@ drivers/scsi/scsi_wait_scan.ko
 drivers/scsi/sd_mod.ko
 drivers/scsi/sg.ko
 drivers/scsi/sr_mod.ko
-drivers/scsi/sym53c8xx_2/sym53c8xx.ko
 drivers/usb/core/usbcore.ko
 drivers/usb/storage/usb-storage.ko
 drivers/video/cirrusfb.ko
-- 
1.6.2.4




More information about the kernel-team mailing list