diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-12-09 20:57:28 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-12-29 12:07:47 +0300 |
| commit | 5ca28914b8b4371cfa56b6ee2dec68debb99718f (patch) | |
| tree | 4c6565b24a5595b7797c60e5433daf812daab0c3 | |
| parent | f3dab1e317ad9f22d8062382447a37febe5858d2 (diff) | |
| download | linux-5ca28914b8b4371cfa56b6ee2dec68debb99718f.tar.xz | |
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>
| -rw-r--r-- | drivers/video/fbdev/omap2/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/video/fbdev/omap2/Makefile | 2 | ||||
| -rw-r--r-- | drivers/video/fbdev/omap2/omapfb/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/video/fbdev/omap2/omapfb/Makefile | 1 | ||||
| -rw-r--r-- | drivers/video/fbdev/omap2/omapfb/vrfb.c (renamed from drivers/video/fbdev/omap2/vrfb.c) | 0 |
5 files changed, 4 insertions, 5 deletions
diff --git a/drivers/video/fbdev/omap2/Kconfig b/drivers/video/fbdev/omap2/Kconfig index c22955d2de9a..7fbdb583de8c 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 c73a1e864ae8..a52b716a40c1 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 13d99a9e6198..e6226aeed17e 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 0490951f95b3..ad68ecf141af 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 index f346b02eee1d..f346b02eee1d 100644 --- a/drivers/video/fbdev/omap2/vrfb.c +++ b/drivers/video/fbdev/omap2/omapfb/vrfb.c |