[PATCH 3/4] UBUNTU: [Config] Enable CONFIG_SCSI=y for ia64 and sparc

[Leann Ogasawara]

>From 83c397165b767ee3bc0a4a5495b50d9cff66f836 Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara at canonical.com>
Date: Sun, 23 May 2010 09:53:52 -0700
Subject: [PATCH 3/4] UBUNTU: [Config] Enable CONFIG_SCSI=y for ia64 and sparc

CONFIG_SCSI was inconsistent between archs.  Set CONFIG_SCSI=y for ia64
and sparc to make this config option consistent amongst all archs.

Signed-off-by: Leann Ogasawara <leann.ogasawara at canonical.com>
---
 debian.master/config/config.common.ports           |    3 +++
 debian.master/config/ia64/config.common.ia64       |    2 --
 debian.master/config/powerpc/config.common.powerpc |    2 --
 debian.master/config/sparc/config.common.sparc     |    2 --
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports
index 90f7f3e..c1d354c 100644
--- a/debian.master/config/config.common.ports
+++ b/debian.master/config/config.common.ports
@@ -1225,6 +1225,7 @@ CONFIG_HPET=y
 CONFIG_HPET_MMAP=y
 CONFIG_HPFS_FS=m
 # CONFIG_HP_SIMETH is not set
+# CONFIG_HP_SIMSCSI is not set
 # CONFIG_HP_SIMSERIAL is not set
 CONFIG_HTC_I2CPLD=y
 CONFIG_HTC_PASIC3=m
@@ -2868,6 +2869,7 @@ CONFIG_SCHED_MC=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_SCHED_SMT=y
 # CONFIG_SCHED_TRACER is not set
+CONFIG_SCSI=y
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_3W_SAS=m
 CONFIG_SCSI_AACRAID=m
@@ -2919,6 +2921,7 @@ CONFIG_SCSI_MAC53C94=m
 CONFIG_SCSI_MESH=m
 CONFIG_SCSI_MESH_RESET_DELAY_MS=4000
 CONFIG_SCSI_MESH_SYNC_RATE=5
+CONFIG_SCSI_MOD=y
 CONFIG_SCSI_MPT2SAS=m
 # CONFIG_SCSI_MPT2SAS_LOGGING is not set
 CONFIG_SCSI_MPT2SAS_MAX_SGE=128
diff --git a/debian.master/config/ia64/config.common.ia64 b/debian.master/config/ia64/config.common.ia64
index 56406bd..0d4b5b7 100644
--- a/debian.master/config/ia64/config.common.ia64
+++ b/debian.master/config/ia64/config.common.ia64
@@ -190,7 +190,6 @@ CONFIG_RTC_DRV_M48T59=m
 CONFIG_SATA_SVW=m
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_SCHED_HRTICK is not set
-CONFIG_SCSI=m
 CONFIG_SCSI_AIC7XXX=m
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_DC390T=m
@@ -200,7 +199,6 @@ CONFIG_SCSI_IPR=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_LOGGING=y
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_MOD=m
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1031=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 277dda9..c442f04 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -163,7 +163,6 @@ CONFIG_RTC_DRV_PS3=m
 # CONFIG_RTC_DRV_TEST is not set
 CONFIG_SATA_SVW=y
 CONFIG_SCHED_HRTICK=y
-CONFIG_SCSI=y
 CONFIG_SCSI_AIC7XXX=m
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_DC390T=m
@@ -172,7 +171,6 @@ CONFIG_SCSI_FUTURE_DOMAIN=m
 # CONFIG_SCSI_IPR is not set
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_MOD=y
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1031=m
diff --git a/debian.master/config/sparc/config.common.sparc b/debian.master/config/sparc/config.common.sparc
index d40de47..0e8e2a4 100644
--- a/debian.master/config/sparc/config.common.sparc
+++ b/debian.master/config/sparc/config.common.sparc
@@ -197,7 +197,6 @@ CONFIG_RTC_DRV_TEST=m
 CONFIG_SATA_SVW=m
 # CONFIG_SCHEDSTATS is not set
 CONFIG_SCHED_HRTICK=y
-CONFIG_SCSI=m
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_DC390T is not set
@@ -207,7 +206,6 @@ CONFIG_SCSI_IPR=m
 # CONFIG_SCSI_IPS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_MOD=m
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1031 is not set
-- 
1.7.0.4