[Trusty][PATCH] UBUNTU: [Config] Normalize AHCI configs on powerpc/ppc64el with the rest of the architectures

[Luis Henriques]

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

Signed-off-by: Adam Conrad <adconrad at 0c3.net>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 debian.master/config/amd64/config.common.amd64     | 4 ----
 debian.master/config/arm64/config.common.arm64     | 4 ----
 debian.master/config/armhf/config.common.armhf     | 4 ----
 debian.master/config/config.common.ubuntu          | 4 ++++
 debian.master/config/i386/config.common.i386       | 4 ----
 debian.master/config/powerpc/config.common.powerpc | 6 +-----
 debian.master/config/ppc64el/config.common.ppc64el | 9 +++------
 7 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 6c219cb1ca78..1c325a0ca47e 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -154,12 +154,8 @@ CONFIG_RTC_DRV_CMOS=y
 CONFIG_RTC_DRV_DS3232=m
 CONFIG_SAMSUNG_USB2PHY=m
 CONFIG_SAMSUNG_USB3PHY=m
-CONFIG_SATA_ACARD_AHCI=m
-CONFIG_SATA_AHCI=m
 CONFIG_SATA_AHCI_PLATFORM=m
 # CONFIG_SATA_HIGHBANK is not set
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_SIL24=m
 CONFIG_SATA_SVW=m
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_SMT=y
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index bddd0fe0549e..5b1016b718e5 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -119,12 +119,8 @@ CONFIG_RFKILL=y
 # CONFIG_RT2X00_LIB_DEBUGFS is not set
 CONFIG_RTC_DRV_DS3232=m
 CONFIG_RTC_DRV_PL031=m
-CONFIG_SATA_ACARD_AHCI=m
-CONFIG_SATA_AHCI=m
 CONFIG_SATA_AHCI_PLATFORM=m
 # CONFIG_SATA_HIGHBANK is not set
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_SIL24=m
 CONFIG_SATA_SVW=m
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCSI_SPI_ATTRS=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index bdc07bc8acc9..16ebcddeba38 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -129,11 +129,7 @@ CONFIG_RTC_DRV_DS3232=m
 CONFIG_RTC_DRV_PL031=y
 CONFIG_SAMSUNG_USB2PHY=m
 CONFIG_SAMSUNG_USB3PHY=m
-CONFIG_SATA_ACARD_AHCI=m
-CONFIG_SATA_AHCI=m
 CONFIG_SATA_HIGHBANK=y
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_SIL24=m
 CONFIG_SATA_SVW=m
 CONFIG_SCHED_AUTOGROUP=y
 # CONFIG_SCHED_SMT is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 5e7609be4e8f..c2eeda608a80 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -5439,7 +5439,10 @@ CONFIG_S2IO=m
 CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_SAMSUNG_Q10=m
 CONFIG_SAMSUNG_USBPHY=m
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_AHCI=m
 CONFIG_SATA_FSL=m
+CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
 CONFIG_SATA_NV=m
 CONFIG_SATA_PMP=y
@@ -5447,6 +5450,7 @@ CONFIG_SATA_PROMISE=m
 CONFIG_SATA_QSTOR=m
 CONFIG_SATA_RCAR=m
 CONFIG_SATA_SIL=m
+CONFIG_SATA_SIL24=m
 CONFIG_SATA_SIS=m
 CONFIG_SATA_SX4=m
 CONFIG_SATA_ULI=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index e3b81aa223a8..7a8f2d1703b1 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -151,12 +151,8 @@ CONFIG_RTC_DRV_CMOS=y
 CONFIG_RTC_DRV_DS3232=m
 CONFIG_SAMSUNG_USB2PHY=m
 CONFIG_SAMSUNG_USB3PHY=m
-CONFIG_SATA_ACARD_AHCI=m
-CONFIG_SATA_AHCI=m
 CONFIG_SATA_AHCI_PLATFORM=m
 # CONFIG_SATA_HIGHBANK is not set
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_SIL24=m
 CONFIG_SATA_SVW=m
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_SMT=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 4e0bd202ab41..a5c040acfe09 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -173,12 +173,8 @@ CONFIG_RT2800USB_UNKNOWN=y
 CONFIG_RTC_DRV_CMOS=m
 CONFIG_SAMSUNG_USB2PHY=m
 CONFIG_SAMSUNG_USB3PHY=m
-CONFIG_SATA_ACARD_AHCI=m
-CONFIG_SATA_AHCI=m
 CONFIG_SATA_AHCI_PLATFORM=m
-CONFIG_SATA_HIGHBANK=m
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_SIL24=m
+# CONFIG_SATA_HIGHBANK is not set
 CONFIG_SATA_SVW=y
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCSI_SPI_ATTRS=m
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index a0f163cf0d7b..23e66a20fdb6 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -2,6 +2,7 @@
 # Config options for config.common.ppc64el automatically generated by splitconfig.pl
 #
 CONFIG_64BIT=y
+# CONFIG_AHCI_IMX is not set
 CONFIG_AIC79XX_RESET_DELAY_MS=5000
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
@@ -213,12 +214,8 @@ CONFIG_RTC_DRV_CMOS=m
 CONFIG_RTC_DRV_DS3232=m
 # CONFIG_SAMSUNG_USB2PHY is not set
 # CONFIG_SAMSUNG_USB3PHY is not set
-# CONFIG_SATA_ACARD_AHCI is not set
-# CONFIG_SATA_AHCI is not set
-# CONFIG_SATA_AHCI_PLATFORM is not set
-CONFIG_SATA_HIGHBANK=m
-# CONFIG_SATA_INIC162X is not set
-# CONFIG_SATA_SIL24 is not set
+CONFIG_SATA_AHCI_PLATFORM=m
+# CONFIG_SATA_HIGHBANK is not set
 CONFIG_SATA_SVW=m
 # CONFIG_SCHED_AUTOGROUP is not set
 CONFIG_SCHED_SMT=y
-- 
1.9.1