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 c22955d2de9a8675ecdf8cdf86edcd5260741ac5..7fbdb583de8ce7b9f5b43d9377573a7c37fc752b 100644 (file)
--- 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 c73a1e864ae885169de32634cf84924c0573a13f..a52b716a40c171dd69825a66031f2eb31b16e7a0 100644 (file)
--- 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 13d99a9e619837c2b46628aee67225ba803199ee..e6226aeed17ed7f75407170693bccb2d5fdabdc8 100644 (file)
--- 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 0490951f95b324a93b5b52db86f4453c90e399d0..ad68ecf141af2ebd2d255e7bd187d383063007c1 100644 (file)
--- 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