aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-12-12 17:16:17 +0000
committerMark Brown <broonie@linaro.org>2013-12-12 17:16:17 +0000
commitdf6930e66aeb200ec4c5a56492d8a6869df62a3f (patch)
tree80867ed1ce4c8d5dd0f534bce801e4c53ad72fbf
parent16c29dd8dd14a722836ca31440486feb2d730e29 (diff)
parentdaba0d21c3dca231f6c6ac0a69c34c7d74f3abbb (diff)
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-fvp' into linux-linaro-lsk
-rw-r--r--drivers/video/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index d0d9c5ea9e3..29a5121ce7f 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -317,7 +317,8 @@ config FB_PM2_FIFO_DISCONNECT
config FB_ARMCLCD
tristate "ARM PrimeCell PL110 support"
- depends on FB && ARM && ARM_AMBA
+ depends on ARM || ARM64 || COMPILE_TEST
+ depends on FB && ARM_AMBA
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT