diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 9c81f3b..22389cd 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -46,6 +46,7 @@ CONFIG_DEBUG_KERNEL=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 CONFIG_DM_RAID45=m
+CONFIG_DRM_OMAP=m
 # CONFIG_DVB_FE_CUSTOMISE is not set
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
@@ -65,6 +66,7 @@ CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_DDC=m
 # CONFIG_FB_MACMODES is not set
+CONFIG_FB_OMAP2=m
 CONFIG_FB_RADEON=m
 CONFIG_FB_SVGALIB=m
 CONFIG_FB_SYS_COPYAREA=m
@@ -182,8 +184,10 @@ CONFIG_NODES_SHIFT=6
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NR_CPUS=256
 CONFIG_NVRAM=m
+CONFIG_OMAP2_VRAM_SIZE=6
 CONFIG_OSF_PARTITION=y
 CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_PANEL_TFP410=m
 CONFIG_PARPORT_1284=y
 CONFIG_PATA_ARASAN_CF=m
 CONFIG_PATA_SIS=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 1248e50..29b16c4 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -46,6 +46,7 @@ CONFIG_DEBUG_USER=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_DM_RAID45 is not set
+CONFIG_DRM_OMAP=m
 CONFIG_DVB_FE_CUSTOMISE=y
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
 CONFIG_DW_DMAC=m
@@ -65,6 +66,7 @@ CONFIG_FB_CFB_FILLRECT=m
 CONFIG_FB_CFB_IMAGEBLIT=m
 # CONFIG_FB_DDC is not set
 # CONFIG_FB_MACMODES is not set
+CONFIG_FB_OMAP2=m
 # CONFIG_FB_SVGALIB is not set
 CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_FILLRECT=m
@@ -188,8 +190,10 @@ CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NOP_USB_XCEIV=y
 CONFIG_NVRAM=m
 CONFIG_OC_ETM=y
+CONFIG_OMAP2_VRAM_SIZE=6
 CONFIG_OSF_PARTITION=y
 CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_PANEL_TFP410=m
 CONFIG_PARPORT_1284=y
 CONFIG_PATA_ARASAN_CF=m
 # CONFIG_PCCARD is not set
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 2b3d3ab..ed1aca3 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -23,9 +23,6 @@ CONFIG_DVB_FE_CUSTOMISE=y
 CONFIG_FAT_FS=y
 # CONFIG_FB_BACKLIGHT is not set
 # CONFIG_FB_BOOT_VESA_SUPPORT is not set
-CONFIG_FB_CFB_COPYAREA=m
-CONFIG_FB_CFB_FILLRECT=m
-CONFIG_FB_CFB_IMAGEBLIT=m
 # CONFIG_FB_DDC is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_SVGALIB is not set
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 1fe77a1..8b3ed42 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -30,6 +30,7 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+CONFIG_DRM_OMAP=m
 # CONFIG_DW_DMAC is not set
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_ENABLE_WARN_DEPRECATED=y
@@ -38,6 +39,10 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_EXT2_FS=y
 # CONFIG_FANOTIFY is not set
 # CONFIG_FB_ARMCLCD is not set
+CONFIG_FB_CFB_COPYAREA=m
+CONFIG_FB_CFB_FILLRECT=m
+CONFIG_FB_CFB_IMAGEBLIT=m
+CONFIG_FB_OMAP2=m
 # CONFIG_FONTS is not set
 # CONFIG_FPE_NWFPE is not set
 # CONFIG_FTRACE is not set
@@ -130,7 +135,9 @@ CONFIG_NET_CALXEDA_XGMAC=y
 CONFIG_NLS_CODEPAGE_437=m
 CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_OC_ETM is not set
+CONFIG_OMAP2_VRAM_SIZE=6
 # CONFIG_OSF_PARTITION is not set
+CONFIG_PANEL_TFP410=m
 # CONFIG_PARPORT_1284 is not set
 # CONFIG_PATA_ARASAN_CF is not set
 CONFIG_PL330_DMA=y
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 1cf7756..b154f12 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -30,6 +30,7 @@ CONFIG_CRASH_DUMP=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DEBUG_USER=y
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+# CONFIG_DRM_OMAP is not set
 CONFIG_DW_DMAC=m
 # CONFIG_ENABLE_MUST_CHECK is not set
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
@@ -38,6 +39,10 @@ CONFIG_EXPERT=y
 CONFIG_EXT2_FS=m
 CONFIG_FANOTIFY=y
 CONFIG_FB_ARMCLCD=m
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_OMAP2=y
 CONFIG_FONTS=y
 CONFIG_FPE_NWFPE=y
 CONFIG_FTRACE=y
@@ -130,7 +135,9 @@ CONFIG_NET_DMA=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_OC_ETM=y
+CONFIG_OMAP2_VRAM_SIZE=16
 CONFIG_OSF_PARTITION=y
+CONFIG_PANEL_TFP410=y
 CONFIG_PARPORT_1284=y
 CONFIG_PATA_ARASAN_CF=m
 CONFIG_PL330_DMA=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index af97bcc..4c76dca 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1391,7 +1391,6 @@ CONFIG_DRM_MGA=m
 CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU_DEBUG=y
-CONFIG_DRM_OMAP=m
 CONFIG_DRM_OMAP_NUM_CRTCS=1
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
@@ -1764,7 +1763,6 @@ CONFIG_FB_NVIDIA_BACKLIGHT=y
 # CONFIG_FB_NVIDIA_DEBUG is not set
 CONFIG_FB_NVIDIA_I2C=y
 CONFIG_FB_OF=y
-CONFIG_FB_OMAP2=m
 CONFIG_FB_OMAP2_DEBUG_SUPPORT=y
 CONFIG_FB_OMAP2_NUM_FBS=3
 CONFIG_FB_PLATINUM=y
@@ -3884,7 +3882,6 @@ CONFIG_OMAP2_DSS_SDI=y
 CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
 CONFIG_OMAP2_DSS_VENC=y
 CONFIG_OMAP2_VRAM=y
-CONFIG_OMAP2_VRAM_SIZE=6
 CONFIG_OMAP2_VRFB=y
 CONFIG_OMAP3_EMU=y
 # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
@@ -3939,7 +3936,6 @@ CONFIG_PANEL_PARPORT=0
 CONFIG_PANEL_PICODLP=m
 CONFIG_PANEL_PROFILE=5
 CONFIG_PANEL_SHARP_LS037V7DW01=y
-CONFIG_PANEL_TFP410=m
 CONFIG_PANEL_TPO_TD043MTEA1=y
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index ad9f741..19cb8a6 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -45,6 +45,7 @@ CONFIG_DEBUG_KERNEL=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 CONFIG_DM_RAID45=m
+CONFIG_DRM_OMAP=m
 # CONFIG_DVB_FE_CUSTOMISE is not set
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
@@ -64,6 +65,7 @@ CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_DDC=m
 # CONFIG_FB_MACMODES is not set
+CONFIG_FB_OMAP2=m
 CONFIG_FB_RADEON=m
 CONFIG_FB_SVGALIB=m
 CONFIG_FB_SYS_COPYAREA=m
@@ -180,9 +182,11 @@ CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NR_CPUS=8
 CONFIG_NVRAM=m
+CONFIG_OMAP2_VRAM_SIZE=6
 CONFIG_OSF_PARTITION=y
 CONFIG_OUTPUT_FORMAT="elf32-i386"
 CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_PANEL_TFP410=m
 CONFIG_PARPORT_1284=y
 CONFIG_PATA_ARASAN_CF=m
 CONFIG_PATA_SIS=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 5047cf7..733a73c 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -39,6 +39,7 @@ CONFIG_DEBUG_KERNEL=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_DM_RAID45 is not set
+CONFIG_DRM_OMAP=m
 # CONFIG_DVB_FE_CUSTOMISE is not set
 CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
 # CONFIG_ENABLE_MUST_CHECK is not set
@@ -58,6 +59,7 @@ CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_DDC=y
 CONFIG_FB_MACMODES=y
+CONFIG_FB_OMAP2=m
 CONFIG_FB_RADEON=y
 CONFIG_FB_SVGALIB=m
 CONFIG_FB_TILEBLITTING=y
@@ -169,7 +171,9 @@ CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NODES_SHIFT=8
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NVRAM=y
+CONFIG_OMAP2_VRAM_SIZE=6
 CONFIG_OSF_PARTITION=y
+CONFIG_PANEL_TFP410=m
 CONFIG_PARPORT_1284=y
 CONFIG_PATA_ARASAN_CF=m
 CONFIG_PATA_SIS=m
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 949a4b8..f16d4b9 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -44,6 +44,7 @@ CONFIG_DEBUG_KERNEL=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_DM_RAID45 is not set
+CONFIG_DRM_OMAP=m
 # CONFIG_DVB_FE_CUSTOMISE is not set
 CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
 # CONFIG_ENABLE_MUST_CHECK is not set
@@ -63,6 +64,7 @@ CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_DDC=y
 CONFIG_FB_MACMODES=y
+CONFIG_FB_OMAP2=m
 CONFIG_FB_RADEON=y
 CONFIG_FB_SVGALIB=m
 CONFIG_FB_SYS_COPYAREA=y
@@ -189,8 +191,10 @@ CONFIG_NODES_SHIFT=8
 CONFIG_NONSTATIC_KERNEL=y
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NR_CPUS=1024
+CONFIG_OMAP2_VRAM_SIZE=6
 CONFIG_OSF_PARTITION=y
 CONFIG_PAGE_OFFSET=0xc000000000000000
+CONFIG_PANEL_TFP410=m
 CONFIG_PARPORT_1284=y
 CONFIG_PATA_ARASAN_CF=m
 CONFIG_PATA_SIS=m
