aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2011-08-29 13:40:57 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-09-23 08:59:13 -0600
commit508e0b15ee7124d4b6e52eb5f35b91eb8de28d7c (patch)
tree8c132ab035f31aeed426096c03aa867b5714baee
parentfcb97bd08b5439213d22fb27fbcca870cdcd293b (diff)
UBUNTU: [Config] Enable CONFIG_PANEL=m on powerpc
Per the non-module modular review, enable CONFIG_PANEL=m on powerpc for consistency across all flavors. Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
-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 5c63effc347..809a4856142 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -156,7 +156,6 @@ CONFIG_NODES_SHIFT=6
CONFIG_NOP_USB_XCEIV=m
CONFIG_NVRAM=m
CONFIG_OUTPUT_FORMAT="elf64-x86-64"
-CONFIG_PANEL=m
CONFIG_PANEL_GENERIC_DPI=m
CONFIG_PATA_CMD640_PCI=m
CONFIG_PATA_OPTI=m
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 051863ad3b6..4bd98168d24 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -141,7 +141,6 @@ CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NOP_USB_XCEIV=y
CONFIG_NVRAM=m
CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PANEL=m
CONFIG_PANEL_GENERIC_DPI=y
CONFIG_PATA_CMD640_PCI=m
CONFIG_PATA_OPTI=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index fccd4d2e14b..9110b74af92 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3587,6 +3587,7 @@ CONFIG_PACKET=y
CONFIG_PADATA=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PANASONIC_LAPTOP=m
+CONFIG_PANEL=m
CONFIG_PANEL_ACX565AKM=m
# CONFIG_PANEL_CHANGE_MESSAGE is not set
CONFIG_PANEL_LGPHILIPS_LB035Q02=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 2dd3914440e..7f7514f5c1f 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -156,7 +156,6 @@ CONFIG_NR_CPUS=8
CONFIG_NVRAM=m
CONFIG_OUTPUT_FORMAT="elf32-i386"
CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PANEL=m
CONFIG_PANEL_GENERIC_DPI=m
CONFIG_PATA_CMD640_PCI=m
CONFIG_PATA_OPTI=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 4ed43014ebc..9f46561b2ed 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -138,7 +138,6 @@ CONFIG_NL80211_TESTMODE=y
CONFIG_NODES_SHIFT=8
CONFIG_NOP_USB_XCEIV=m
CONFIG_NVRAM=y
-# CONFIG_PANEL is not set
CONFIG_PANEL_GENERIC_DPI=m
# CONFIG_PATA_CMD640_PCI is not set
# CONFIG_PATA_OPTI is not set
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 6acc304feaa..1c5b5498287 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -159,7 +159,6 @@ CONFIG_NODES_SHIFT=8
CONFIG_NOP_USB_XCEIV=m
CONFIG_NR_CPUS=1024
CONFIG_PAGE_OFFSET=0xc000000000000000
-# CONFIG_PANEL is not set
# CONFIG_PATA_CMD640_PCI is not set
# CONFIG_PATA_OPTI is not set
CONFIG_PATA_SIS=m