diff options
| -rw-r--r-- | drivers/staging/omapdrm/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/video/omap2/dss/dss_features.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/omapdrm/Kconfig b/drivers/staging/omapdrm/Kconfig index b724a4131435..09f65dc3d2c8 100644 --- a/drivers/staging/omapdrm/Kconfig +++ b/drivers/staging/omapdrm/Kconfig | |||
| @@ -3,8 +3,8 @@ config DRM_OMAP | |||
| 3 | tristate "OMAP DRM" | 3 | tristate "OMAP DRM" |
| 4 | depends on DRM && !CONFIG_FB_OMAP2 | 4 | depends on DRM && !CONFIG_FB_OMAP2 |
| 5 | depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM | 5 | depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM |
| 6 | depends on OMAP2_DSS | ||
| 6 | select DRM_KMS_HELPER | 7 | select DRM_KMS_HELPER |
| 7 | select OMAP2_DSS | ||
| 8 | select FB_SYS_FILLRECT | 8 | select FB_SYS_FILLRECT |
| 9 | select FB_SYS_COPYAREA | 9 | select FB_SYS_COPYAREA |
| 10 | select FB_SYS_IMAGEBLIT | 10 | select FB_SYS_IMAGEBLIT |
diff --git a/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c index 18688c12e30d..d7d66ef5cb58 100644 --- a/drivers/video/omap2/dss/dss_features.c +++ b/drivers/video/omap2/dss/dss_features.c | |||
| @@ -538,6 +538,7 @@ static const enum dss_feat_id omap3630_dss_feat_list[] = { | |||
| 538 | FEAT_ALPHA_FIXED_ZORDER, | 538 | FEAT_ALPHA_FIXED_ZORDER, |
| 539 | FEAT_FIFO_MERGE, | 539 | FEAT_FIFO_MERGE, |
| 540 | FEAT_OMAP3_DSI_FIFO_BUG, | 540 | FEAT_OMAP3_DSI_FIFO_BUG, |
| 541 | FEAT_DPI_USES_VDDS_DSI, | ||
| 541 | }; | 542 | }; |
| 542 | 543 | ||
| 543 | static const enum dss_feat_id omap4430_es1_0_dss_feat_list[] = { | 544 | static const enum dss_feat_id omap4430_es1_0_dss_feat_list[] = { |