Commit 7ea76ebb authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'omapdss-for-3.8-rc8' of git://gitorious.org/linux-omap-dss2/linux

Pull omapdss fixes from Tomi Valkeinen:
 "It'd be great if these two late fixes would still make it into 3.8.
  The other one fixes ARM kernel compilation when using 'allyesconfig',
  and the other makes DPI displays function again on OMAP3630 boards:

   - Fix ARM compilation with "allyesconfig" (omapdrm: fix the
     dependency to omapdss)

   - fix DPI displays on OMAP3630 (OMAPDSS: add FEAT_DPI_USES_VDDS_DSI
     to omap3630_dss_feat_list)"

* tag 'omapdss-for-3.8-rc8' of git://gitorious.org/linux-omap-dss2/linux:
  omapdrm: fix the dependency to omapdss
  OMAPDSS: add FEAT_DPI_USES_VDDS_DSI to omap3630_dss_feat_list
parents f0a34ac9 91e83ffd
...@@ -3,8 +3,8 @@ config DRM_OMAP ...@@ -3,8 +3,8 @@ config DRM_OMAP
tristate "OMAP DRM" tristate "OMAP DRM"
depends on DRM && !CONFIG_FB_OMAP2 depends on DRM && !CONFIG_FB_OMAP2
depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM
depends on OMAP2_DSS
select DRM_KMS_HELPER select DRM_KMS_HELPER
select OMAP2_DSS
select FB_SYS_FILLRECT select FB_SYS_FILLRECT
select FB_SYS_COPYAREA select FB_SYS_COPYAREA
select FB_SYS_IMAGEBLIT select FB_SYS_IMAGEBLIT
......
...@@ -538,6 +538,7 @@ static const enum dss_feat_id omap3630_dss_feat_list[] = { ...@@ -538,6 +538,7 @@ static const enum dss_feat_id omap3630_dss_feat_list[] = {
FEAT_ALPHA_FIXED_ZORDER, FEAT_ALPHA_FIXED_ZORDER,
FEAT_FIFO_MERGE, FEAT_FIFO_MERGE,
FEAT_OMAP3_DSI_FIFO_BUG, FEAT_OMAP3_DSI_FIFO_BUG,
FEAT_DPI_USES_VDDS_DSI,
}; };
static const enum dss_feat_id omap4430_es1_0_dss_feat_list[] = { static const enum dss_feat_id omap4430_es1_0_dss_feat_list[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment