summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-07-15 09:58:06 +0200
committerArnd Bergmann <arnd@arndb.de>2014-07-23 17:41:00 +0200
commitec4c4d877becf1c224f45347f4fc0016765e00d0 (patch)
tree65978c77a047bbec724f7996bba69d4474ed244c /drivers/video
parent9db58cc9f385457524d3f6548198532168aecd23 (diff)
downloadop-kernel-dev-ec4c4d877becf1c224f45347f4fc0016765e00d0.zip
op-kernel-dev-ec4c4d877becf1c224f45347f4fc0016765e00d0.tar.gz
video: fix up versatile CLCD helper move
commit 11c32d7b6274cb0f ("video: move Versatile CLCD helpers") moved files out of the plat-versatile directory but in the process got a few of the dependencies wrong: - If CONFIG_FB is not set, the file no longer gets built, resulting in a link error - If CONFIG_FB or CONFIG_FB_ARMCLCD are disabled, we also get a Kconfig warning for incorrect dependencies due to the symbol being 'select'ed from the platform Kconfig. - When the file is not built, we also get a link error for missing symbols. This patch should fix all three, by removing the 'select' statements, changing the Kconfig description of the symbol to be enabled in exactly the right configurations, and adding inline stub functions for the case when the framebuffer driver is disabled. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/Kconfig6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index 92026d3..bdf4630 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -292,10 +292,8 @@ config FB_ARMCLCD
# Helper logic selected only by the ARM Versatile platform family.
config PLAT_VERSATILE_CLCD
- depends on FB_ARMCLCD
- depends on (PLAT_VERSATILE || ARCH_INTEGRATOR)
- default y
- bool
+ def_bool ARCH_VERSATILE || ARCH_REALVIEW || ARCH_VEXPRESS
+ depends on FB_ARMCLCD && FB=y
config FB_ACORN
bool "Acorn VIDC support"
OpenPOWER on IntegriCloud