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/Makefile | |
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/Makefile')
-rw-r--r-- | drivers/video/fbdev/omap2/omapfb/dss/Makefile | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/Makefile b/drivers/video/fbdev/omap2/omapfb/dss/Makefile index b5136d3d4b77..02308e24f3ef 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/Makefile +++ b/drivers/video/fbdev/omap2/omapfb/dss/Makefile @@ -1,18 +1,18 @@ -obj-$(CONFIG_OMAP2_DSS_INIT) += omapdss-boot-init.o -obj-$(CONFIG_OMAP2_DSS) += omapdss.o +obj-$(CONFIG_FB_OMAP2_DSS_INIT) += omapdss-boot-init.o +obj-$(CONFIG_FB_OMAP2_DSS) += omapdss.o # Core DSS files omapdss-y := core.o dss.o dss_features.o dispc.o dispc_coefs.o display.o \ output.o dss-of.o pll.o video-pll.o # DSS compat layer files omapdss-y += manager.o manager-sysfs.o overlay.o overlay-sysfs.o apply.o \ dispc-compat.o display-sysfs.o -omapdss-$(CONFIG_OMAP2_DSS_DPI) += dpi.o -omapdss-$(CONFIG_OMAP2_DSS_RFBI) += rfbi.o -omapdss-$(CONFIG_OMAP2_DSS_VENC) += venc.o -omapdss-$(CONFIG_OMAP2_DSS_SDI) += sdi.o -omapdss-$(CONFIG_OMAP2_DSS_DSI) += dsi.o -omapdss-$(CONFIG_OMAP2_DSS_HDMI_COMMON) += hdmi_common.o hdmi_wp.o hdmi_pll.o \ +omapdss-$(CONFIG_FB_OMAP2_DSS_DPI) += dpi.o +omapdss-$(CONFIG_FB_OMAP2_DSS_RFBI) += rfbi.o +omapdss-$(CONFIG_FB_OMAP2_DSS_VENC) += venc.o +omapdss-$(CONFIG_FB_OMAP2_DSS_SDI) += sdi.o +omapdss-$(CONFIG_FB_OMAP2_DSS_DSI) += dsi.o +omapdss-$(CONFIG_FB_OMAP2_DSS_HDMI_COMMON) += hdmi_common.o hdmi_wp.o hdmi_pll.o \ hdmi_phy.o -omapdss-$(CONFIG_OMAP4_DSS_HDMI) += hdmi4.o hdmi4_core.o -omapdss-$(CONFIG_OMAP5_DSS_HDMI) += hdmi5.o hdmi5_core.o -ccflags-$(CONFIG_OMAP2_DSS_DEBUG) += -DDEBUG +omapdss-$(CONFIG_FB_OMAP4_DSS_HDMI) += hdmi4.o hdmi4_core.o +omapdss-$(CONFIG_FB_OMAP5_DSS_HDMI) += hdmi5.o hdmi5_core.o +ccflags-$(CONFIG_FB_OMAP2_DSS_DEBUG) += -DDEBUG |