commit 35b522cfb00fae5d8d744fb2c50fc96c94592d44
author Tomi Valkeinen <tomi.valkeinen@ti.com> Wed Dec 09 19:24:58 2015 +0200
committer Tomi Valkeinen <tomi.valkeinen@ti.com> Tue Dec 29 11:07:46 2015 +0200
tree b3488ae2333428338705b9f9c70f336f77922210
parent fc6caa0b5b9b234fc9efff4342956d5d06112137

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>

drivers/video/fbdev/omap2/omapfb/dss/dispc.c

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dispc.c b/drivers/video/fbdev/omap2/omapfb/dss/dispc.c
index 6b50476..5491e30 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/dispc.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dispc.c
@@ -3721,8 +3721,8 @@
 	unsigned min_fck_per_pck;
 	unsigned long fck;
 
-#ifdef CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK
-	min_fck_per_pck = CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK;
+#ifdef CONFIG_FB_OMAP2_DSS_MIN_FCK_PER_PCK
+	min_fck_per_pck = CONFIG_FB_OMAP2_DSS_MIN_FCK_PER_PCK;
 #else
 	min_fck_per_pck = 0;
 #endif