diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-29 13:40:57 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-11-16 14:41:18 -0700 |
| commit | a0dccb967c64d3dfc2e1e49519c54d6a1a8d8f46 (patch) | |
| tree | d571e88a96062e84d62a3daf42d8c15391637b43 | |
| parent | e00b5b62802ba76e5b6849eb26233722efe16924 (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.amd64 | 1 | ||||
| -rw-r--r-- | debian.master/config/armel/config.common.armel | 1 | ||||
| -rw-r--r-- | debian.master/config/config.common.ubuntu | 1 | ||||
| -rw-r--r-- | debian.master/config/i386/config.common.i386 | 1 | ||||
| -rw-r--r-- | debian.master/config/powerpc/config.common.powerpc | 1 | ||||
| -rw-r--r-- | debian.master/config/ppc64/config.common.ppc64 | 1 |
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 c4f128a9517..d613373f07f 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -159,7 +159,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_PARAVIRT_TIME_ACCOUNTING is not set CONFIG_PATA_CMD640_PCI=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index a50de88f54b..8d15a2eed45 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -143,7 +143,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_PARAVIRT_TIME_ACCOUNTING=n CONFIG_PATA_CMD640_PCI=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index afb7e36ec00..270942f1dce 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3636,6 +3636,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 74fc8a7d2c3..4b82de7ee72 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -158,7 +158,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_PARAVIRT_TIME_ACCOUNTING is not set CONFIG_PATA_CMD640_PCI=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 23b843f7730..15dc82d02b0 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -140,7 +140,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_PARAVIRT_TIME_ACCOUNTING=n # CONFIG_PATA_CMD640_PCI is not set diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 1e26945935b..da7126c113c 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -161,7 +161,6 @@ CONFIG_NODES_SHIFT=8 CONFIG_NOP_USB_XCEIV=m CONFIG_NR_CPUS=1024 CONFIG_PAGE_OFFSET=0xc000000000000000 -# CONFIG_PANEL is not set CONFIG_PARAVIRT_TIME_ACCOUNTING=n # CONFIG_PATA_CMD640_PCI is not set # CONFIG_PATA_OPTI is not set |