aboutsummaryrefslogtreecommitdiff
path: root/debian.master
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2011-08-29 13:50:54 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-11-16 14:41:16 -0700
commitb5f62b61beb9eea398014f782e716fa349a44752 (patch)
treee1abe5d0219f2a4d765658e006dc263c00b98e53 /debian.master
parentd12f4036e4cc2c047647c3766111ec00a64e1f53 (diff)
downloadlinux-linaro-precise-b5f62b61beb9eea398014f782e716fa349a44752.tar.gz
UBUNTU: [Config] Enable CONFIG_PATA_NS87410=m on powerpc
Per the non-modular module review, enable CONFIG_PATA_NS87410=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 9fc30d9845b..d74991015b6 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -164,7 +164,6 @@ CONFIG_PANEL=m
CONFIG_PANEL_GENERIC_DPI=m
# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_NS87410=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 4ea2594ec65..9813fd47735 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -148,7 +148,6 @@ CONFIG_PANEL=m
CONFIG_PANEL_GENERIC_DPI=y
CONFIG_PARAVIRT_TIME_ACCOUNTING=n
CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_NS87410=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 285f94e281b..7c6c5f14aef 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3712,6 +3712,7 @@ CONFIG_PATA_MARVELL=m
CONFIG_PATA_MPIIX=m
CONFIG_PATA_NETCELL=m
CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87410=m
CONFIG_PATA_NS87415=m
CONFIG_PATA_OF_PLATFORM=m
CONFIG_PATA_OLDPIIX=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 38fe1b8bdad..8bb96a0019a 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -163,7 +163,6 @@ CONFIG_PANEL=m
CONFIG_PANEL_GENERIC_DPI=m
# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_NS87410=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 d13df623abe..23b843f7730 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -144,7 +144,6 @@ CONFIG_NVRAM=y
CONFIG_PANEL_GENERIC_DPI=m
CONFIG_PARAVIRT_TIME_ACCOUNTING=n
# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_NS87410 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 146db2acbcd..6006e863a17 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -165,7 +165,6 @@ CONFIG_PAGE_OFFSET=0xc000000000000000
# CONFIG_PANEL is not set
CONFIG_PARAVIRT_TIME_ACCOUNTING=n
# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_NS87410 is not set
# CONFIG_PATA_OPTI is not set
CONFIG_PATA_SIS=m
CONFIG_PCCARD=m