tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 7ea76ebb f0a34ac9

+2 -1
+1 -1
drivers/staging/omapdrm/Kconfig
··· 3 3 tristate "OMAP DRM" 4 4 depends on DRM && !CONFIG_FB_OMAP2 5 5 depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM 6 + depends on OMAP2_DSS 6 7 select DRM_KMS_HELPER 7 - select OMAP2_DSS 8 8 select FB_SYS_FILLRECT 9 9 select FB_SYS_COPYAREA 10 10 select FB_SYS_IMAGEBLIT
+1
drivers/video/omap2/dss/dss_features.c
··· 538 538 FEAT_ALPHA_FIXED_ZORDER, 539 539 FEAT_FIFO_MERGE, 540 540 FEAT_OMAP3_DSI_FIFO_BUG, 541 + FEAT_DPI_USES_VDDS_DSI, 541 542 }; 542 543 543 544 static const enum dss_feat_id omap4430_es1_0_dss_feat_list[] = {