diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-03-22 01:27:36 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-22 01:27:36 -0400 |
| commit | da49252fb0392d8196833ef3da92e48fb371f8d7 (patch) | |
| tree | 1299899f7513a900b2229b8cde289bca8c41d2f5 /arch/arm/configs | |
| parent | eddecbb601c9ea3fab7e67d7892010fc9426d1e6 (diff) | |
| parent | b295d6e593e02168fdafc5db11464b6d51cf239d (diff) | |
Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux
Conflicts:
arch/arm/mach-omap2/board-overo.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
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 019fb7c67dc3..076db52ff672 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig | |||
| @@ -193,6 +193,17 @@ CONFIG_FIRMWARE_EDID=y | |||
| 193 | CONFIG_FB_MODE_HELPERS=y | 193 | CONFIG_FB_MODE_HELPERS=y |
| 194 | CONFIG_FB_TILEBLITTING=y | 194 | CONFIG_FB_TILEBLITTING=y |
| 195 | CONFIG_FB_OMAP_LCD_VGA=y | 195 | CONFIG_FB_OMAP_LCD_VGA=y |
| 196 | CONFIG_OMAP2_DSS=m | ||
| 197 | CONFIG_OMAP2_DSS_RFBI=y | ||
| 198 | CONFIG_OMAP2_DSS_SDI=y | ||
| 199 | CONFIG_OMAP2_DSS_DSI=y | ||
| 200 | CONFIG_FB_OMAP2=m | ||
| 201 | CONFIG_PANEL_GENERIC_DPI=m | ||
| 202 | CONFIG_PANEL_SHARP_LS037V7DW01=m | ||
| 203 | CONFIG_PANEL_NEC_NL8048HL11_01B=m | ||
| 204 | CONFIG_PANEL_TAAL=m | ||
| 205 | CONFIG_PANEL_TPO_TD043MTEA1=m | ||
| 206 | CONFIG_PANEL_ACX565AKM=m | ||
| 196 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 207 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
| 197 | CONFIG_LCD_CLASS_DEVICE=y | 208 | CONFIG_LCD_CLASS_DEVICE=y |
| 198 | CONFIG_LCD_PLATFORM=y | 209 | CONFIG_LCD_PLATFORM=y |