[PATCH 2/2] UBUNTU: [Config] de-modularise SATA disk controllers

[Andy Whitcroft]

    CONFIG_SATA_AHCI=m
    CONFIG_SATA_INIC162X=m
    CONFIG_SATA_NV=m
    CONFIG_SATA_PROMISE=m
    CONFIG_SATA_QSTOR=m
    CONFIG_SATA_SIL=m
    CONFIG_SATA_SIL24=m
    CONFIG_SATA_SIS=m
    CONFIG_SATA_SVW=m
    CONFIG_SATA_SX4=m
    CONFIG_SATA_ULI=m
    CONFIG_SATA_VITESSE=m

Signed-off-by: Andy Whitcroft <apw at canonical.com>
---
 debian.master/config/amd64/config.common.amd64 |    1 -
 debian.master/config/armel/config.common.armel |    1 -
 debian.master/config/config.common.ubuntu      |   23 ++++++++++++-----------
 debian.master/config/i386/config.common.i386   |    1 -
 debian.master/config/lpia/config.common.lpia   |    1 -
 5 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index a8b3906..110f377 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -113,7 +113,6 @@ CONFIG_RFD_FTL=m
 CONFIG_RPCSEC_GSS_SPKM3=m
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-CONFIG_SATA_SX4=y
 CONFIG_SCSI_ACARD=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_OSD_INITIATOR=m
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index a0a5159..3103939 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -97,7 +97,6 @@ CONFIG_RCU_FANOUT=32
 # CONFIG_RFD_FTL is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_SATA_SX4 is not set
 # CONFIG_SCSI_ACARD is not set
 # CONFIG_SCSI_ADVANSYS is not set
 # CONFIG_SCSI_NSP32 is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 2ea2383..c1ab99e 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3102,20 +3102,21 @@ CONFIG_RT_MUTEXES=y
 CONFIG_RXKAD=m
 CONFIG_S2IO=m
 # CONFIG_SAMPLES is not set
-CONFIG_SATA_AHCI=y
-CONFIG_SATA_INIC162X=y
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
-CONFIG_SATA_NV=y
+CONFIG_SATA_NV=m
 CONFIG_SATA_PMP=y
-CONFIG_SATA_PROMISE=y
-CONFIG_SATA_QSTOR=y
-CONFIG_SATA_SIL=y
-CONFIG_SATA_SIL24=y
-CONFIG_SATA_SIS=y
-CONFIG_SATA_SVW=y
-CONFIG_SATA_ULI=y
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_ULI=m
 CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=y
+CONFIG_SATA_VITESSE=m
 CONFIG_SBC7240_WDT=m
 CONFIG_SBC8360_WDT=m
 CONFIG_SBC_EPX_C3_WATCHDOG=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index e1ee049..feed603 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -113,7 +113,6 @@ CONFIG_RFD_FTL=m
 CONFIG_RPCSEC_GSS_SPKM3=m
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_SATA_SX4=m
 CONFIG_SCSI_ACARD=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_NSP32=m
diff --git a/debian.master/config/lpia/config.common.lpia b/debian.master/config/lpia/config.common.lpia
index 816b7dd..ca7f6d1 100644
--- a/debian.master/config/lpia/config.common.lpia
+++ b/debian.master/config/lpia/config.common.lpia
@@ -123,7 +123,6 @@ CONFIG_RFD_FTL=m
 CONFIG_RPCSEC_GSS_SPKM3=m
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_SATA_SX4=m
 CONFIG_SCSI_ACARD=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_NSP32=m
-- 
1.7.0