| commit | 5ca28914b8b4371cfa56b6ee2dec68debb99718f | [log] [tgz] |
|---|---|---|
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | Wed Dec 09 19:57:28 2015 +0200 |
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | Tue Dec 29 11:07:47 2015 +0200 |
| tree | 4c6565b24a5595b7797c60e5433daf812daab0c3 | |
| parent | f3dab1e317ad9f22d8062382447a37febe5858d2 [diff] |
omapfb: move vrfb into omapfb VRFB is only used by omapfb, so we can move it under omapfb's directory. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Acked-by: Dave Airlie <airlied@gmail.com> Acked-by: Rob Clark <robdclark@gmail.com>
diff --git a/drivers/video/fbdev/omap2/Kconfig b/drivers/video/fbdev/omap2/Kconfig index c22955d..7fbdb58 100644 --- a/drivers/video/fbdev/omap2/Kconfig +++ b/drivers/video/fbdev/omap2/Kconfig
@@ -1,6 +1,3 @@ -config OMAP2_VRFB - bool - if ARCH_OMAP2PLUS source "drivers/video/fbdev/omap2/dss/Kconfig"
diff --git a/drivers/video/fbdev/omap2/Makefile b/drivers/video/fbdev/omap2/Makefile index c73a1e8..a52b716 100644 --- a/drivers/video/fbdev/omap2/Makefile +++ b/drivers/video/fbdev/omap2/Makefile
@@ -1,5 +1,3 @@ -obj-$(CONFIG_OMAP2_VRFB) += vrfb.o - obj-y += dss/ obj-y += displays-new/ obj-y += omapfb/
diff --git a/drivers/video/fbdev/omap2/omapfb/Kconfig b/drivers/video/fbdev/omap2/omapfb/Kconfig index 13d99a9..e6226ae 100644 --- a/drivers/video/fbdev/omap2/omapfb/Kconfig +++ b/drivers/video/fbdev/omap2/omapfb/Kconfig
@@ -1,3 +1,6 @@ +config OMAP2_VRFB + bool + menuconfig FB_OMAP2 tristate "OMAP2+ frame buffer support" depends on FB
diff --git a/drivers/video/fbdev/omap2/omapfb/Makefile b/drivers/video/fbdev/omap2/omapfb/Makefile index 0490951..ad68ecf 100644 --- a/drivers/video/fbdev/omap2/omapfb/Makefile +++ b/drivers/video/fbdev/omap2/omapfb/Makefile
@@ -1,3 +1,4 @@ +obj-$(CONFIG_OMAP2_VRFB) += vrfb.o obj-y += dss/ obj-y += displays/ obj-$(CONFIG_FB_OMAP2) += omapfb.o
diff --git a/drivers/video/fbdev/omap2/vrfb.c b/drivers/video/fbdev/omap2/omapfb/vrfb.c similarity index 100% rename from drivers/video/fbdev/omap2/vrfb.c rename to drivers/video/fbdev/omap2/omapfb/vrfb.c