summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2015-12-09 19:23:44 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-12-29 11:07:46 +0200
commitfc6caa0b5b9b234fc9efff4342956d5d06112137 (patch)
tree4b3bdcac113bf0f8c051f439f5d8b053e84caeba
parentf76ee892a99e68b55402b8d4b8aeffcae2aff34d (diff)
downloadlinux-stable-fc6caa0b5b9b234fc9efff4342956d5d06112137.tar.gz
linux-stable-fc6caa0b5b9b234fc9efff4342956d5d06112137.tar.bz2
linux-stable-fc6caa0b5b9b234fc9efff4342956d5d06112137.zip
omapdss: remove CONFIG_OMAP2_DSS_VENC from omapdss.h
We are about to make a private copy of omapdss for omapfb and for omapdrm. The omapdss.h file will still be shared for the time being. The copy will need to change the config symbols, and we happen to have one use of these config symbols in omapdss.h which needs to be removed. Luckily we can just delete the use of CONFIG_OMAP2_DSS_VENC from omapdss, as it's used only to hide extern declarations, and there's no harm to have those declarations even if CONFIG_OMAP2_DSS_VENC is not set. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Acked-by: Dave Airlie <airlied@gmail.com> Acked-by: Rob Clark <robdclark@gmail.com>
-rw-r--r--include/video/omapdss.h2
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;