video: Make vexpress DVI driver depend on CONFIG_FB

The driver uses symbols from fbmem.c so if CONFIG_FB is not
selected we get build errors like:

drivers/built-in.o: In function `vexpress_dvi_fb_select':
 :(.text+0x1b6c): undefined reference to `lock_fb_info'
 :(.text+0x1ba0): undefined reference to `registered_fb'

Note, this is only a partial solution because we still have a
problem if CONFIG_FB is selected as a module.

Signed-off-by: Jon Medhurst <tixy@linaro.org>

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 2e937bdace6f123a1b6f1c0c055b4422dde78875..aa9429fd4d4fdadd75284e21e7bb2c5a7593edc8 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -39,6 +39,11 @@ config VIDEOMODE_HELPERS
 config HDMI
        bool
 
+config VEXPRESS_DVI_CONTROL
+       bool "Versatile Express DVI control"
+       depends on FB && VEXPRESS_CONFIG
+       default y
+
 menuconfig FB
        tristate "Support for frame buffer devices"
        ---help---

diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 5084e8c4da9f947098710dad9358c7476545eca5..6b5d5f2b43076fc4c4fc033e0896b00e8c307c0e 100644 (file)
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -179,4 +179,4 @@ obj-$(CONFIG_VIDEOMODE_HELPERS) += of_display_timing.o of_videomode.o
 endif
 
 # platform specific output drivers
-obj-$(CONFIG_VEXPRESS_CONFIG)    += vexpress-dvi.o
+obj-$(CONFIG_VEXPRESS_DVI_CONTROL) += vexpress-dvi.o