UBUNTU: [Config] CONFIG_ATA=y

BugLink: http://bugs.launchpad.net/bugs/1626394
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 37b0c12da8dbaced5e3e8789aee31965b2540c5b..4b3dcf59d695444e5580825bdb776ecca5c31686 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -42,7 +42,6 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARM_GIC_MAX_NR=1
 # CONFIG_ASYNC_RAID6_TEST is not set
-CONFIG_ATA=m
 CONFIG_ATALK=m
 CONFIG_ATARI_PARTITION=y
 # CONFIG_ATA_NONSTANDARD is not set
@@ -337,13 +336,13 @@ CONFIG_RTC_I2C_AND_SPI=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y
 # CONFIG_SCHED_TRACER is not set
-CONFIG_SCSI=m
+CONFIG_SCSI=y
 CONFIG_SCSI_DMX3191D=m
 CONFIG_SCSI_DPT_I2O=m
 CONFIG_SCSI_EATA_LINKED_COMMANDS=y
 CONFIG_SCSI_EATA_TAGGED_QUEUE=y
 CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_MOD=m
+CONFIG_SCSI_MOD=y
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index cdc195c8aae2b1718277198b275acedf90530689..fb8194b9584bfc80548cad630096409133eeb63a 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -38,7 +38,6 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARM_GIC_MAX_NR=1
 # CONFIG_ASYNC_RAID6_TEST is not set
-CONFIG_ATA=m
 CONFIG_ATALK=m
 # CONFIG_ATARI_PARTITION is not set
 # CONFIG_ATA_NONSTANDARD is not set
@@ -339,9 +338,9 @@ CONFIG_RTC_I2C_AND_SPI=m
 CONFIG_SCHED_MC=y
 # CONFIG_SCHED_SMT is not set
 # CONFIG_SCHED_TRACER is not set
-CONFIG_SCSI=m
+CONFIG_SCSI=y
 CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_MOD=m
+CONFIG_SCSI_MOD=y
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 85598422da351df8ebb5cb1e95d008ace7ebf28e..4614b5213f4282a66353c5bd593d7755803d88b0 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -25,7 +25,6 @@ CONFIG_ARCH_MMAP_RND_BITS_MIN=8
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 CONFIG_ARM_GIC_MAX_NR=2
 # CONFIG_ASYNC_RAID6_TEST is not set
-CONFIG_ATA=m
 CONFIG_ATALK=m
 # CONFIG_ATARI_PARTITION is not set
 # CONFIG_ATA_NONSTANDARD is not set
@@ -322,9 +321,9 @@ CONFIG_RTC_I2C_AND_SPI=y
 # CONFIG_SCHED_MC is not set
 # CONFIG_SCHED_SMT is not set
 # CONFIG_SCHED_TRACER is not set
-CONFIG_SCSI=m
+CONFIG_SCSI=y
 CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_MOD=m
+CONFIG_SCSI_MOD=y
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 89f0010c1330d3f12cff762a14ed757c63d4ca40..5c8e60ca040caf0c09f779e0d29184f5cf2cf562 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -670,6 +670,7 @@ CONFIG_AT803X_PHY=m
 # CONFIG_AT91SAM9X_WATCHDOG is not set
 # CONFIG_AT91_ADC is not set
 # CONFIG_AT91_SAMA5D2_ADC is not set
+CONFIG_ATA=y
 CONFIG_ATAGS=y
 CONFIG_ATAGS_PROC=y
 CONFIG_ATA_ACPI=y

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index e32fa869a01b0aff956496c817297ac0cdf38bbe..055a8268ae8a41dfbd23d1964e8bd0ed4f6d6f46 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -37,7 +37,6 @@ CONFIG_ARCH_RANDOM=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARM_GIC_MAX_NR=1
 # CONFIG_ASYNC_RAID6_TEST is not set
-CONFIG_ATA=m
 CONFIG_ATALK=m
 CONFIG_ATARI_PARTITION=y
 # CONFIG_ATA_NONSTANDARD is not set
@@ -330,13 +329,13 @@ CONFIG_RTC_I2C_AND_SPI=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y
 # CONFIG_SCHED_TRACER is not set
-CONFIG_SCSI=m
+CONFIG_SCSI=y
 CONFIG_SCSI_DMX3191D=m
 CONFIG_SCSI_DPT_I2O=m
 CONFIG_SCSI_EATA_LINKED_COMMANDS=y
 CONFIG_SCSI_EATA_TAGGED_QUEUE=y
 CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_MOD=m
+CONFIG_SCSI_MOD=y
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set

diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index d0c5c0d6cc20bb85082d322fbad81ec5ab544162..84d3ab589c14850dac66f51f01b3b7b922be5ab6 100644 (file)
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -148,8 +148,10 @@ CONFIG_RTC_DRV_PALMAS=m
 CONFIG_RTC_DRV_S5M=m
 CONFIG_RTC_DRV_TWL4030=m
 CONFIG_RTC_I2C_AND_SPI=y
+CONFIG_SCSI=y
 CONFIG_SCSI_DMX3191D=m
 CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_MOD=y
 # CONFIG_SENSORS_SCH56XX_COMMON is not set
 CONFIG_SERIAL_8250=y
 # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set

diff --git a/debian.master/config/powerpc/config.flavour.generic b/debian.master/config/powerpc/config.flavour.generic
index b81a5adec9b1491324a4a0a5f02ac1ba61a16a91..397a43f1c535d6dedf9bf4a8cad9f3797c4e30bd 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.generic
+++ b/debian.master/config/powerpc/config.flavour.generic
@@ -17,7 +17,6 @@ CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARCH_RANDOM=y
 # CONFIG_ASYNC_RAID6_TEST is not set
-CONFIG_ATA=y
 # CONFIG_ATARI_PARTITION is not set
 CONFIG_ATA_NONSTANDARD=y
 # CONFIG_ATH10K_DEBUGFS is not set
@@ -229,11 +228,9 @@ CONFIG_RSI_DEBUGFS=y
 # CONFIG_SCHEDSTATS is not set
 CONFIG_SCHED_SMT=y
 # CONFIG_SCHED_TRACER is not set
-CONFIG_SCSI=y
 # CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
 # CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
 # CONFIG_SCSI_GDTH is not set
-CONFIG_SCSI_MOD=y
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set

diff --git a/debian.master/config/powerpc/config.flavour.powerpc-e500mc b/debian.master/config/powerpc/config.flavour.powerpc-e500mc
index 07ed088962ac2cd8df00c5eb758fd3c0ef0aaec5..cd118f52a20e31b38cdf72412478fd3d3a85ee85 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.powerpc-e500mc
+++ b/debian.master/config/powerpc/config.flavour.powerpc-e500mc
@@ -17,7 +17,6 @@ CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 # CONFIG_ARCH_RANDOM is not set
 CONFIG_ASYNC_RAID6_TEST=m
-CONFIG_ATA=m
 CONFIG_ATARI_PARTITION=y
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATH10K_DEBUGFS=y
@@ -221,11 +220,9 @@ CONFIG_RFKILL=y
 CONFIG_RT2800USB_UNKNOWN=y
 CONFIG_SCHEDSTATS=y
 CONFIG_SCHED_TRACER=y
-CONFIG_SCSI=m
 CONFIG_SCSI_EATA_LINKED_COMMANDS=y
 CONFIG_SCSI_EATA_TAGGED_QUEUE=y
 CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_MOD=m
 CONFIG_SCSI_PROC_FS=y
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
 CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y

diff --git a/debian.master/config/powerpc/config.flavour.powerpc-smp b/debian.master/config/powerpc/config.flavour.powerpc-smp
index 4a2f291c2549f3ecd33316b60c1fa2482e39fd7f..9382bb78b99d363aacd7312f1a30617cf874cf69 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.powerpc-smp
+++ b/debian.master/config/powerpc/config.flavour.powerpc-smp
@@ -17,7 +17,6 @@ CONFIG_AGP=y
 # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
 # CONFIG_ARCH_RANDOM is not set
 # CONFIG_ASYNC_RAID6_TEST is not set
-CONFIG_ATA=y
 # CONFIG_ATARI_PARTITION is not set
 # CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_ATH10K_DEBUGFS is not set
@@ -222,11 +221,9 @@ CONFIG_RSI_DEBUGFS=y
 # CONFIG_RT2800USB_UNKNOWN is not set
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_SCHED_TRACER is not set
-CONFIG_SCSI=y
 # CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
 # CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
 # CONFIG_SCSI_GDTH is not set
-CONFIG_SCSI_MOD=y
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set

diff --git a/debian.master/config/powerpc/config.flavour.powerpc64-emb b/debian.master/config/powerpc/config.flavour.powerpc64-emb
index 247d8515489bb01885a981bb7c4b23bcc0a087da..c1408803cbb1e21db8bf4d134769446738912c60 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.powerpc64-emb
+++ b/debian.master/config/powerpc/config.flavour.powerpc64-emb
@@ -17,7 +17,6 @@ CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 # CONFIG_ARCH_RANDOM is not set
 CONFIG_ASYNC_RAID6_TEST=m
-CONFIG_ATA=m
 CONFIG_ATARI_PARTITION=y
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATH10K_DEBUGFS=y
@@ -228,11 +227,9 @@ CONFIG_RT2800USB_UNKNOWN=y
 CONFIG_SCHEDSTATS=y
 # CONFIG_SCHED_SMT is not set
 CONFIG_SCHED_TRACER=y
-CONFIG_SCSI=m
 CONFIG_SCSI_EATA_LINKED_COMMANDS=y
 CONFIG_SCSI_EATA_TAGGED_QUEUE=y
 CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_MOD=m
 CONFIG_SCSI_PROC_FS=y
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
 CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 22efac5f8825a3f5a7baa096c667ccf14dbbd92a..1bd4c068d093615655f3ed4d9ccea6bdfd3d5dcf 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -30,7 +30,6 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARM_GIC_MAX_NR=1
 # CONFIG_ASYNC_RAID6_TEST is not set
-CONFIG_ATA=y
 CONFIG_ATALK=m
 # CONFIG_ATARI_PARTITION is not set
 # CONFIG_ATA_NONSTANDARD is not set