diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-12-09 20:24:58 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-12-29 12:07:46 +0300 |
| commit | 35b522cfb00fae5d8d744fb2c50fc96c94592d44 (patch) | |
| tree | b3488ae2333428338705b9f9c70f336f77922210 /drivers/video/fbdev/omap2/omapfb/dss/dss.c | |
| parent | fc6caa0b5b9b234fc9efff4342956d5d06112137 (diff) | |
| download | linux-35b522cfb00fae5d8d744fb2c50fc96c94592d44.tar.xz | |
omapfb/dss: change CONFIG_OMAP* to CONFIG_FB_OMAP*
We need to change the config symbols of omapfb's private copy of
omapdss so that we won't have config symbol conflicts.
This patch changes the symbols from omapdss using simple replacement of
CONFIG_OMAP* to CONFIG_FB_OMAP*.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Dave Airlie <airlied@gmail.com>
Acked-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/video/fbdev/omap2/omapfb/dss/dss.c')
| -rw-r--r-- | drivers/video/fbdev/omap2/omapfb/dss/dss.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.c b/drivers/video/fbdev/omap2/omapfb/dss/dss.c index f95ff319e68e..0078c4d1fc31 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/dss.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.c @@ -793,12 +793,12 @@ void dss_runtime_put(void) } /* DEBUGFS */ -#if defined(CONFIG_OMAP2_DSS_DEBUGFS) +#if defined(CONFIG_FB_OMAP2_DSS_DEBUGFS) void dss_debug_dump_clocks(struct seq_file *s) { dss_dump_clocks(s); dispc_dump_clocks(s); -#ifdef CONFIG_OMAP2_DSS_DSI +#ifdef CONFIG_FB_OMAP2_DSS_DSI dsi_dump_clocks(s); #endif } @@ -1144,7 +1144,7 @@ static int dss_bind(struct device *dev) dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK); -#ifdef CONFIG_OMAP2_DSS_VENC +#ifdef CONFIG_FB_OMAP2_DSS_VENC REG_FLD_MOD(DSS_CONTROL, 1, 4, 4); /* venc dac demen */ REG_FLD_MOD(DSS_CONTROL, 1, 3, 3); /* venc clock 4x enable */ REG_FLD_MOD(DSS_CONTROL, 0, 2, 2); /* venc clock mode = normal */ |