From a60a5d6ad59e3b943155309b139c663fe5cb6e44 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Sun, 28 Jan 2007 12:43:17 +0000
Subject: [PATCH] * debian/arch/config: Enable new scsi parts. *
 debian/arch/powerpc/config.powerpc64: Enable ibmvscsis. * debian/changelog:
 Update.

svn path=/dists/trunk/linux-2.6/; revision=8243
---
 debian/arch/config                   | 7 ++++++-
 debian/arch/powerpc/config.powerpc64 | 2 ++
 debian/changelog                     | 4 +++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/arch/config b/debian/arch/config
index 6f56272bb..51e19c0e7 100644
--- a/debian/arch/config
+++ b/debian/arch/config
@@ -225,6 +225,7 @@ CONFIG_SCSI_SATA_ULI=m
 CONFIG_SCSI_SATA_VIA=m
 CONFIG_SCSI_SATA_VITESSE=m
 CONFIG_SCSI=m
+CONFIG_SCSI_TGT=m
 CONFIG_SCSI_PROC_FS=y
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
@@ -236,9 +237,14 @@ CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m
 CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
+CONFIG_ISCSI_TCP=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_7000FASST=m
@@ -638,7 +644,6 @@ CONFIG_VIDEO_EM28XX=m
 CONFIG_RFD_FTL=m
 CONFIG_DVB_NXT200X=m
 # CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_ISCSI_TCP=m
 CONFIG_SCTP_HMAC_MD5=y
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_TELCLOCK=m
diff --git a/debian/arch/powerpc/config.powerpc64 b/debian/arch/powerpc/config.powerpc64
index 9e6327d18..901c431c8 100644
--- a/debian/arch/powerpc/config.powerpc64
+++ b/debian/arch/powerpc/config.powerpc64
@@ -58,6 +58,8 @@ CONFIG_SCHED_SMT=y
 CONFIG_SCSI_QLOGIC_1280_1040=y
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_IBMVSCSI=m
+CONFIG_SCSI_SRP=m
+CONFIG_SCSI_IBMVSCSIS=m
 # CONFIG_SERIAL_ICOM is not set
 CONFIG_SMP=y
 CONFIG_STOP_MACHINE=y
diff --git a/debian/changelog b/debian/changelog
index d7db450b2..19cc44716 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ linux-2.6 (2.6.20~rc6-1~experimental.1) UNRELEASED; urgency=low
 
   [ Bastian Blank ]
   * Remove legacy pty support. (closes: #338404)
+  * Enable new scsi parts.
+  * powerpc: Enable ibmvscsis.
 
   [ Rod Whitby ]
   * arm/ixp4xx: Enable PATA_ARTOP for the nas100d and dsmg600.
@@ -21,7 +23,7 @@ linux-2.6 (2.6.20~rc6-1~experimental.1) UNRELEASED; urgency=low
   * Add nas100d Ethernet MAC setup support.
   * Add temporary hack to get Artop PATA support going on the nas100d.
 
- -- Bastian Blank <waldi@debian.org>  Mon,  4 Dec 2006 07:16:41 +0100
+ -- Bastian Blank <waldi@debian.org>  Sun, 28 Jan 2007 13:42:18 +0100
 
 linux-2.6 (2.6.18.dfsg.1-9) unstable; urgency=low