Message ID | 1296187838-23021-3-git-send-email-ricardo.salveti@canonical.com |
---|---|
State | Accepted |
Delegated to: | Tim Gardner |
Headers | show |
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index eceaea2..40f3797 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -267,6 +267,7 @@ CONFIG_NO_HZ=y CONFIG_NVRAM=m CONFIG_OUTPUT_FORMAT="elf64-x86-64" CONFIG_PANEL=m +CONFIG_PANEL_GENERIC_DPI=m CONFIG_PARPORT=m CONFIG_PATA_ALI=m CONFIG_PATA_ARTOP=m diff --git a/debian.master/config/armel/config.flavour.omap b/debian.master/config/armel/config.flavour.omap index 8fcc1b5..9e91234 100644 --- a/debian.master/config/armel/config.flavour.omap +++ b/debian.master/config/armel/config.flavour.omap @@ -101,6 +101,7 @@ CONFIG_NFTL=m CONFIG_NOP_USB_XCEIV=y CONFIG_NO_HZ=y CONFIG_OC_ETM=y +CONFIG_PANEL_GENERIC_DPI=y CONFIG_PARPORT=m # CONFIG_PCI_SYSCALL is not set # CONFIG_PREEMPT_NONE is not set diff --git a/debian.master/config/armel/config.flavour.versatile b/debian.master/config/armel/config.flavour.versatile index cdf5e0b..98289f4 100644 --- a/debian.master/config/armel/config.flavour.versatile +++ b/debian.master/config/armel/config.flavour.versatile @@ -101,6 +101,7 @@ CONFIG_NET_TCPPROBE=m CONFIG_NOP_USB_XCEIV=m # CONFIG_NO_HZ is not set # CONFIG_OC_ETM is not set +CONFIG_PANEL_GENERIC_DPI=m # CONFIG_PARPORT is not set CONFIG_PCI_SYSCALL=y CONFIG_PREEMPT_NONE=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index e58f49b..5842cc6 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3360,7 +3360,6 @@ CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PANASONIC_LAPTOP=m CONFIG_PANEL_ACX565AKM=m # CONFIG_PANEL_CHANGE_MESSAGE is not set -CONFIG_PANEL_GENERIC_DPI=m CONFIG_PANEL_NEC_NL8048HL11_01B=m CONFIG_PANEL_PARPORT=0 CONFIG_PANEL_PROFILE=5 diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index c9089ef..a047e3c 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -267,6 +267,7 @@ CONFIG_NVRAM=m CONFIG_OUTPUT_FORMAT="elf32-i386" CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PANEL=m +CONFIG_PANEL_GENERIC_DPI=m CONFIG_PARPORT=m CONFIG_PATA_ALI=m CONFIG_PATA_ARTOP=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 91a3cb9..65de7f8 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -237,6 +237,7 @@ CONFIG_NOP_USB_XCEIV=m CONFIG_NO_HZ=y CONFIG_NVRAM=y # CONFIG_PANEL is not set +CONFIG_PANEL_GENERIC_DPI=m CONFIG_PARPORT=m # CONFIG_PATA_ALI is not set # CONFIG_PATA_ARTOP is not set
Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 1 + debian.master/config/armel/config.flavour.omap | 1 + .../config/armel/config.flavour.versatile | 1 + debian.master/config/config.common.ubuntu | 1 - debian.master/config/i386/config.common.i386 | 1 + debian.master/config/powerpc/config.common.powerpc | 1 + 6 files changed, 5 insertions(+), 1 deletions(-)