@@ -196,8 +196,6 @@ afs
ah4
ah6
ahci
-ahci_imx
-ahci_platform
aic79xx
aic7xxx
aic94xx
@@ -4,6 +4,7 @@
CONFIG_64BIT=y
CONFIG_AC97_BUS=m
CONFIG_ACPI_BLACKLIST_YEAR=0
+CONFIG_AHCI_IMX=m
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
@@ -69,6 +70,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
CONFIG_RT2800USB_UNKNOWN=y
# CONFIG_RT2X00_LIB_DEBUGFS is not set
CONFIG_RTC_DRV_CMOS=y
+CONFIG_SATA_AHCI_PLATFORM=m
# CONFIG_SATA_HIGHBANK is not set
CONFIG_SCHED_SMT=y
CONFIG_SCSI_SPI_ATTRS=y
@@ -2,6 +2,7 @@
# Config options for config.flavour.generic automatically generated by splitconfig.pl
#
CONFIG_AC97_BUS=y
+CONFIG_AHCI_IMX=y
CONFIG_ARCH_MXC=y
CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
CONFIG_ARCH_NR_GPIO=1024
@@ -22,6 +23,7 @@ CONFIG_MTD_SM_COMMON=m
# CONFIG_MUSB_PIO_ONLY is not set
CONFIG_PCI_SYSCALL=y
# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_SATA_AHCI_PLATFORM=y
CONFIG_SND_EMU10K1_SEQ=m
CONFIG_SND_OPL3_LIB_SEQ=m
CONFIG_SPI_PXA2XX_PCI=m
@@ -2,6 +2,7 @@
# Config options for config.flavour.generic-lpae automatically generated by splitconfig.pl
#
CONFIG_AC97_BUS=m
+CONFIG_AHCI_IMX=m
# CONFIG_ARCH_MXC is not set
# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
CONFIG_ARCH_NR_GPIO=0
@@ -22,6 +23,7 @@ CONFIG_HUGETLB_PAGE=y
CONFIG_MUSB_PIO_ONLY=y
# CONFIG_PCI_SYSCALL is not set
CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_SATA_AHCI_PLATFORM=m
# CONFIG_SND_EMU10K1_SEQ is not set
# CONFIG_SND_OPL3_LIB_SEQ is not set
# CONFIG_SPI_PXA2XX_PCI is not set
@@ -171,7 +171,6 @@ CONFIG_AGP_NVIDIA=y
CONFIG_AGP_SIS=m
CONFIG_AGP_SWORKS=m
CONFIG_AGP_VIA=y
-CONFIG_AHCI_IMX=m
CONFIG_AIC79XX_CMDS_PER_DEVICE=32
# CONFIG_AIC79XX_DEBUG_ENABLE is not set
CONFIG_AIC79XX_DEBUG_MASK=0
@@ -5029,7 +5028,6 @@ CONFIG_SAMSUNG_USB3PHY=m
CONFIG_SAMSUNG_USBPHY=m
CONFIG_SATA_ACARD_AHCI=m
CONFIG_SATA_AHCI=m
-CONFIG_SATA_AHCI_PLATFORM=m
CONFIG_SATA_INIC162X=m
CONFIG_SATA_MV=m
CONFIG_SATA_NV=m
@@ -4,6 +4,7 @@
# CONFIG_64BIT is not set
CONFIG_AC97_BUS=m
CONFIG_ACPI_BLACKLIST_YEAR=2000
+CONFIG_AHCI_IMX=m
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
@@ -67,6 +68,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
CONFIG_RT2800USB_UNKNOWN=y
# CONFIG_RT2X00_LIB_DEBUGFS is not set
CONFIG_RTC_DRV_CMOS=y
+CONFIG_SATA_AHCI_PLATFORM=m
# CONFIG_SATA_HIGHBANK is not set
CONFIG_SCHED_SMT=y
CONFIG_SCSI_SPI_ATTRS=y
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> --- debian.master/abi/3.12.0-0.0/armhf/generic.modules | 2 -- debian.master/config/amd64/config.common.amd64 | 2 ++ debian.master/config/armhf/config.flavour.generic | 2 ++ debian.master/config/armhf/config.flavour.generic-lpae | 2 ++ debian.master/config/config.common.ubuntu | 2 -- debian.master/config/i386/config.common.i386 | 2 ++ 6 files changed, 8 insertions(+), 4 deletions(-)