aboutsummaryrefslogtreecommitdiff
path: root/debian.master
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2011-08-29 13:53:19 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-11-16 14:41:20 -0700
commitda118506daaf6cfa61df8380352bec557ebea2f5 (patch)
tree2f5aceca1fcd10fc632d9280608bad9cdbe71105 /debian.master
parenta0dccb967c64d3dfc2e1e49519c54d6a1a8d8f46 (diff)
downloadlinux-linaro-precise-da118506daaf6cfa61df8380352bec557ebea2f5.tar.gz
UBUNTU: [Config] Enable CONFIG_PATA_CMD640_PCI=m on powerpc
Per the non-modular module review, enable CONFIG_PATA_CMD640_PCI=m on powerpc for consistency across all flavors. Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'debian.master')
-rw-r--r--debian.master/config/amd64/config.common.amd641
-rw-r--r--debian.master/config/armel/config.common.armel1
-rw-r--r--debian.master/config/config.common.ubuntu1
-rw-r--r--debian.master/config/i386/config.common.i3861
-rw-r--r--debian.master/config/powerpc/config.common.powerpc1
-rw-r--r--debian.master/config/ppc64/config.common.ppc641
6 files changed, 1 insertions, 5 deletions
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index d613373f07f..29c3f74aeab 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -161,7 +161,6 @@ CONFIG_NVRAM=m
CONFIG_OUTPUT_FORMAT="elf64-x86-64"
CONFIG_PANEL_GENERIC_DPI=m
# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-CONFIG_PATA_CMD640_PCI=m
CONFIG_PATA_OPTI=m
CONFIG_PATA_SIS=y
CONFIG_PCCARD=m
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 8d15a2eed45..834338bb24c 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -145,7 +145,6 @@ CONFIG_NVRAM=m
CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_PANEL_GENERIC_DPI=y
CONFIG_PARAVIRT_TIME_ACCOUNTING=n
-CONFIG_PATA_CMD640_PCI=m
CONFIG_PATA_OPTI=m
CONFIG_PATA_SIS=y
# CONFIG_PCCARD is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 270942f1dce..10474c0a944 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3692,6 +3692,7 @@ CONFIG_PATA_ARASAN_CF=m
CONFIG_PATA_ARTOP=m
CONFIG_PATA_ATIIXP=m
CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD640_PCI=m
CONFIG_PATA_CMD64X=m
CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 4b82de7ee72..67515de9d2c 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -160,7 +160,6 @@ CONFIG_OUTPUT_FORMAT="elf32-i386"
CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_PANEL_GENERIC_DPI=m
# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-CONFIG_PATA_CMD640_PCI=m
CONFIG_PATA_OPTI=m
CONFIG_PATA_SIS=y
CONFIG_PCCARD=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 15dc82d02b0..5474e9b0876 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -142,7 +142,6 @@ CONFIG_NOP_USB_XCEIV=m
CONFIG_NVRAM=y
CONFIG_PANEL_GENERIC_DPI=m
CONFIG_PARAVIRT_TIME_ACCOUNTING=n
-# CONFIG_PATA_CMD640_PCI is not set
# CONFIG_PATA_OPTI is not set
CONFIG_PATA_SIS=m
CONFIG_PCCARD=m
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index da7126c113c..0bbf33f49e7 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -162,7 +162,6 @@ CONFIG_NOP_USB_XCEIV=m
CONFIG_NR_CPUS=1024
CONFIG_PAGE_OFFSET=0xc000000000000000
CONFIG_PARAVIRT_TIME_ACCOUNTING=n
-# CONFIG_PATA_CMD640_PCI is not set
# CONFIG_PATA_OPTI is not set
CONFIG_PATA_SIS=m
CONFIG_PCCARD=m