r4173 - in dists/trunk/linux-2.6/debian/arch: . alpha amd64 arm hppa i386 ia64 m68k powerpc s390 sparc

Andres Salomon dilinger at costa.debian.org
Mon Sep 12 04:08:54 UTC 2005 

Author: dilinger
Date: 2005-09-12 04:08:49 +0000 (Mon, 12 Sep 2005)
New Revision: 4173

Modified:
   dists/trunk/linux-2.6/debian/arch/alpha/config
   dists/trunk/linux-2.6/debian/arch/amd64/config
   dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
   dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
   dists/trunk/linux-2.6/debian/arch/arm/config.rpc
   dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410
   dists/trunk/linux-2.6/debian/arch/config
   dists/trunk/linux-2.6/debian/arch/hppa/config
   dists/trunk/linux-2.6/debian/arch/i386/config
   dists/trunk/linux-2.6/debian/arch/ia64/config
   dists/trunk/linux-2.6/debian/arch/m68k/config
   dists/trunk/linux-2.6/debian/arch/m68k/config.amiga
   dists/trunk/linux-2.6/debian/arch/m68k/config.atari
   dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000
   dists/trunk/linux-2.6/debian/arch/m68k/config.hp
   dists/trunk/linux-2.6/debian/arch/m68k/config.mac
   dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147
   dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x
   dists/trunk/linux-2.6/debian/arch/m68k/config.q40
   dists/trunk/linux-2.6/debian/arch/m68k/config.sun3
   dists/trunk/linux-2.6/debian/arch/powerpc/config
   dists/trunk/linux-2.6/debian/arch/s390/config
   dists/trunk/linux-2.6/debian/arch/sparc/config
   dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64
   dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp
Log:
Unify generic scsi settings.  SCSI_LOGGING and SCSI_CONSTANTS is now on for
things like m68k and arm; I'm not even really sure how necessary these are
for things like i386. 


Modified: dists/trunk/linux-2.6/debian/arch/alpha/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/config	2005-09-12 03:51:58 UTC (rev 4172)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config	2005-09-12 04:08:49 UTC (rev 4173)
@@ -260,16 +260,7 @@
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
 # CONFIG_BLK_DEV_HD is not set
-CONFIG_SCSI=m
 CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_7000FASST=m

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config	2005-09-12 03:51:58 UTC (rev 4172)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config	2005-09-12 04:08:49 UTC (rev 4173)
@@ -306,16 +306,7 @@
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
 # CONFIG_BLK_DEV_HD is not set
-CONFIG_SCSI=m
 CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=m
-# CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_ACARD=m

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
===================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.footbridge	2005-09-12 03:51:58 UTC (rev 4172)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.footbridge	2005-09-12 04:08:49 UTC (rev 4173)
@@ -92,7 +92,6 @@
 # CONFIG_IDE_CHIPSETS is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_SCSI is not set
 # CONFIG_IEEE1394 is not set
 # CONFIG_I2O is not set
 CONFIG_PACKET=y

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
===================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	2005-09-12 03:51:58 UTC (rev 4172)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	2005-09-12 04:08:49 UTC (rev 4173)
@@ -144,7 +144,6 @@
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_SCSI is not set
 # CONFIG_IEEE1394 is not set
 # CONFIG_I2O is not set
 CONFIG_PACKET=m

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.rpc
===================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.rpc	2005-09-12 03:51:58 UTC (rev 4172)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.rpc	2005-09-12 04:08:49 UTC (rev 4173)
@@ -57,21 +57,7 @@
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
-CONFIG_SCSI=y
-CONFIG_SCSI_PROC_FS=y
 CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=m
-# CONFIG_CHR_DEV_OSST is not set
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=y
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_SCSI_MULTI_LUN is not set
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
 CONFIG_SCSI_PPA=m
 CONFIG_SCSI_IMM=m
 # CONFIG_SCSI_IZIP_EPP16 is not set

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410
===================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410	2005-09-12 03:51:58 UTC (rev 4172)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410	2005-09-12 04:08:49 UTC (rev 4173)
@@ -2,11 +2,6 @@
 CONFIG_HOTPLUG=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_BINFMT_MISC=m
-CONFIG_SCSI_PROC_FS=y
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_SG=m
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=m
 CONFIG_MD_LINEAR=m
@@ -122,11 +117,6 @@
 CONFIG_HOTPLUG=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_BINFMT_MISC=m
-CONFIG_SCSI_PROC_FS=y
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_SG=m
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=m
 CONFIG_MD_LINEAR=m
@@ -363,7 +353,6 @@
 CONFIG_BLK_DEV_IDE_BAST=y
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_SCSI is not set
 # CONFIG_IEEE1394 is not set
 # CONFIG_PACKET is not set
 # CONFIG_NETLINK_DEV is not set

Modified: dists/trunk/linux-2.6/debian/arch/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/config	2005-09-12 03:51:58 UTC (rev 4172)
+++ dists/trunk/linux-2.6/debian/arch/config	2005-09-12 04:08:49 UTC (rev 4173)
@@ -37,11 +37,6 @@
 CONFIG_IOSCHED_AS=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
-CONFIG_SCSI_PROC_FS=y
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_SG=m
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=m
 CONFIG_MD_LINEAR=m
@@ -309,3 +304,18 @@
 CONFIG_SCSI_SATA_ULI=m
 CONFIG_SCSI_SATA_VIA=m
 CONFIG_SCSI_SATA_VITESSE=m
+CONFIG_SCSI=m
+CONFIG_SCSI_PROC_FS=y
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m

Modified: dists/trunk/linux-2.6/debian/arch/hppa/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/hppa/config	2005-09-12 03:51:58 UTC (rev 4172)
+++ dists/trunk/linux-2.6/debian/arch/hppa/config	2005-09-12 04:08:49 UTC (rev 4173)
@@ -166,21 +166,7 @@
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
 # CONFIG_BLK_DEV_HD is not set
-CONFIG_SCSI=y
-CONFIG_SCSI_PROC_FS=y
 CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=m
-# CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-# CONFIG_SCSI_MULTI_LUN is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-CONFIG_SCSI_SPI_ATTRS=y
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
 # CONFIG_SCSI_7000FASST is not set

Modified: dists/trunk/linux-2.6/debian/arch/i386/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config	2005-09-12 03:51:58 UTC (rev 4172)
+++ dists/trunk/linux-2.6/debian/arch/i386/config	2005-09-12 04:08:49 UTC (rev 4173)
@@ -364,16 +364,7 @@
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
 # CONFIG_BLK_DEV_HD is not set
-CONFIG_SCSI=m
 CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=m
-# CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_7000FASST=m

Modified: dists/trunk/linux-2.6/debian/arch/ia64/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/config	2005-09-12 03:51:58 UTC (rev 4172)
+++ dists/trunk/linux-2.6/debian/arch/ia64/config	2005-09-12 04:08:49 UTC (rev 4173)
@@ -251,16 +251,7 @@
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
 # CONFIG_BLK_DEV_HD is not set
-CONFIG_SCSI=m
 CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_ACARD=m

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config	2005-09-12 03:51:58 UTC (rev 4172)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config	2005-09-12 04:08:49 UTC (rev 4173)
@@ -63,20 +63,7 @@
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
 # CONFIG_ATA_OVER_ETH is not set
-CONFIG_SCSI=y
-CONFIG_SCSI_PROC_FS=y
 CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=m
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_SCSI_MULTI_LUN is not set
-CONFIG_SCSI_CONSTANTS=y
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
 # CONFIG_SCSI_DEBUG is not set
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=m

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.amiga
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.amiga	2005-09-12 03:51:58 UTC (rev 4172)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.amiga	2005-09-12 04:08:49 UTC (rev 4173)
@@ -53,7 +53,6 @@
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_HD is not set
-CONFIG_CHR_DEV_OSST=m
 # CONFIG_SCSI_AHA152X is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_ADVANSYS is not set

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.atari
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.atari	2005-09-12 03:51:58 UTC (rev 4172)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.atari	2005-09-12 04:08:49 UTC (rev 4173)
@@ -42,7 +42,6 @@
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_HD is not set
-# CONFIG_CHR_DEV_OSST is not set
 # CONFIG_SCSI_PPA is not set
 # CONFIG_SCSI_IMM is not set
 # CONFIG_DM_MULTIPATH is not set

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000	2005-09-12 03:51:58 UTC (rev 4172)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000	2005-09-12 04:08:49 UTC (rev 4173)
@@ -20,7 +20,6 @@
 # CONFIG_M68KFPU_EMU is not set
 # CONFIG_PARPORT is not set
 # CONFIG_IDE is not set
-# CONFIG_CHR_DEV_OSST is not set
 CONFIG_BVME6000_SCSI=y
 # CONFIG_SCSI_NCR53C7xx_FAST is not set
 # CONFIG_DM_MULTIPATH is not set

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.hp
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.hp	2005-09-12 03:51:58 UTC (rev 4172)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.hp	2005-09-12 04:08:49 UTC (rev 4173)
@@ -20,7 +20,6 @@
 CONFIG_HEARTBEAT=y
 # CONFIG_PARPORT is not set
 # CONFIG_IDE is not set
-# CONFIG_CHR_DEV_OSST is not set
 # CONFIG_DM_MULTIPATH is not set
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.mac
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.mac	2005-09-12 03:51:58 UTC (rev 4172)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.mac	2005-09-12 04:08:49 UTC (rev 4173)
@@ -36,7 +36,6 @@
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_HD is not set
-CONFIG_CHR_DEV_OSST=m
 CONFIG_MAC_SCSI=y
 CONFIG_SCSI_MAC_ESP=y
 CONFIG_DM_MULTIPATH=m

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147	2005-09-12 03:51:58 UTC (rev 4172)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147	2005-09-12 04:08:49 UTC (rev 4173)
@@ -19,7 +19,6 @@
 # CONFIG_M68KFPU_EMU is not set
 # CONFIG_PARPORT is not set
 # CONFIG_IDE is not set
-# CONFIG_CHR_DEV_OSST is not set
 CONFIG_MVME147_SCSI=y
 # CONFIG_DM_MULTIPATH is not set
 CONFIG_IP_PNP=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x	2005-09-12 03:51:58 UTC (rev 4172)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x	2005-09-12 04:08:49 UTC (rev 4173)
@@ -20,7 +20,6 @@
 # CONFIG_M68KFPU_EMU is not set
 # CONFIG_PARPORT is not set
 # CONFIG_IDE is not set
-# CONFIG_CHR_DEV_OSST is not set
 CONFIG_MVME16x_SCSI=y
 # CONFIG_SCSI_NCR53C7xx_FAST is not set
 # CONFIG_DM_MULTIPATH is not set

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.q40
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.q40	2005-09-12 03:51:58 UTC (rev 4172)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.q40	2005-09-12 04:08:49 UTC (rev 4173)
@@ -39,7 +39,6 @@
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_HD is not set
-# CONFIG_CHR_DEV_OSST is not set
 # CONFIG_SCSI_AHA152X is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_IN2000 is not set

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.sun3
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.sun3	2005-09-12 03:51:58 UTC (rev 4172)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.sun3	2005-09-12 04:08:49 UTC (rev 4173)
@@ -7,7 +7,6 @@
 # CONFIG_M68KFPU_EMU_ONLY is not set
 # CONFIG_PARPORT is not set
 # CONFIG_IDE is not set
-# CONFIG_CHR_DEV_OSST is not set
 # CONFIG_DM_MULTIPATH is not set
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config	2005-09-12 03:51:58 UTC (rev 4172)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config	2005-09-12 04:08:49 UTC (rev 4173)
@@ -188,16 +188,7 @@
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
 # CONFIG_BLK_DEV_HD is not set
-CONFIG_SCSI=m
 CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_CONSTANTS is not set
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_ACARD=m

Modified: dists/trunk/linux-2.6/debian/arch/s390/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/s390/config	2005-09-12 03:51:58 UTC (rev 4172)
+++ dists/trunk/linux-2.6/debian/arch/s390/config	2005-09-12 04:08:49 UTC (rev 4173)
@@ -40,16 +40,7 @@
 # CONFIG_PCMCIA is not set
 CONFIG_STANDALONE=y
 # CONFIG_FW_LOADER is not set
-CONFIG_SCSI=m
 CONFIG_BLK_DEV_SD=m
-# CONFIG_CHR_DEV_OSST is not set
-CONFIG_BLK_DEV_SR=m
-# CONFIG_BLK_DEV_SR_VENDOR is not set
-# CONFIG_CHR_DEV_SCH is not set
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_DEBUG is not set
 CONFIG_ZFCP=m
 CONFIG_CCW=y

Modified: dists/trunk/linux-2.6/debian/arch/sparc/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config	2005-09-12 03:51:58 UTC (rev 4172)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config	2005-09-12 04:08:49 UTC (rev 4173)
@@ -81,12 +81,6 @@
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_RAM_SIZE=16384
 CONFIG_ATA_OVER_ETH=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SCH=m
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-CONFIG_SCSI_SPI_ATTRS=m
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_MEGARAID_NEWGEN is not set

Modified: dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64
===================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64	2005-09-12 03:51:58 UTC (rev 4172)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64	2005-09-12 04:08:49 UTC (rev 4173)
@@ -108,10 +108,7 @@
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
 # CONFIG_BLK_DEV_HD is not set
-CONFIG_SCSI=m
 CONFIG_BLK_DEV_SD=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_SCSI_MULTI_LUN=y
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_ACARD=m

Modified: dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp
===================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp	2005-09-12 03:51:58 UTC (rev 4172)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp	2005-09-12 04:08:49 UTC (rev 4173)
@@ -111,10 +111,7 @@
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
 # CONFIG_BLK_DEV_HD is not set
-CONFIG_SCSI=m
 CONFIG_BLK_DEV_SD=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_SCSI_MULTI_LUN=y
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_ACARD=m

More information about the Kernel-svn-changes mailing list