diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-27 09:57:44 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-27 09:57:44 -0400 |
| commit | 801cffdae716aec1bc101f8722054b865cd67799 (patch) | |
| tree | 2c3411ee1260ff0c53e06ed4ee65019abaf009ca /arch/arm/configs | |
| parent | 1be030ee4c589acb079c578a00686a54942d88fb (diff) | |
| parent | c4202c86cdd53c91744d652ec0e16fd28ff6d6f3 (diff) | |
Merge remote-tracking branch 'tmlind/dss2' into linaro-2.6.38
Conflicts:
arch/arm/mach-omap2/board-overo.c
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 019fb7c67dc..076db52ff67 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -193,6 +193,17 @@ CONFIG_FIRMWARE_EDID=y CONFIG_FB_MODE_HELPERS=y CONFIG_FB_TILEBLITTING=y CONFIG_FB_OMAP_LCD_VGA=y +CONFIG_OMAP2_DSS=m +CONFIG_OMAP2_DSS_RFBI=y +CONFIG_OMAP2_DSS_SDI=y +CONFIG_OMAP2_DSS_DSI=y +CONFIG_FB_OMAP2=m +CONFIG_PANEL_GENERIC_DPI=m +CONFIG_PANEL_SHARP_LS037V7DW01=m +CONFIG_PANEL_NEC_NL8048HL11_01B=m +CONFIG_PANEL_TAAL=m +CONFIG_PANEL_TPO_TD043MTEA1=m +CONFIG_PANEL_ACX565AKM=m CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_PLATFORM=y |