diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-12-29 12:09:13 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-12-29 12:09:13 +0300 |
| commit | caf05780f6ed5eb7fe168dbabd9a8d7cfb45d89b (patch) | |
| tree | 29df67a840f9d6bdf50192afadccadfb0a0506b3 /include | |
| parent | ef1ea03d7574273d39b6af49494b02e337992a62 (diff) | |
| parent | 5b63aa3feca79aebf14bc266690fd1d4a9ce4f2d (diff) | |
| download | linux-caf05780f6ed5eb7fe168dbabd9a8d7cfb45d89b.tar.xz | |
Merge omapdss split between omapdrm and omapfb
Merge changes to create a separate copy of omapdss for omapdrm and
omapfb.
Diffstat (limited to 'include')
| -rw-r--r-- | include/video/omapdss.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/video/omapdss.h b/include/video/omapdss.h index bbf942ebdd28..295b41e20d8e 100644 --- a/include/video/omapdss.h +++ b/include/video/omapdss.h @@ -368,14 +368,12 @@ struct omap_video_timings { enum omap_dss_signal_edge sync_pclk_edge; }; -#ifdef CONFIG_OMAP2_DSS_VENC /* Hardcoded timings for tv modes. Venc only uses these to * identify the mode, and does not actually use the configs * itself. However, the configs should be something that * a normal monitor can also show */ extern const struct omap_video_timings omap_dss_pal_timings; extern const struct omap_video_timings omap_dss_ntsc_timings; -#endif struct omap_dss_cpr_coefs { s16 rr, rg, rb; |