summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/armada
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2013-10-23 10:09:56 +0100
committerDave Airlie <airlied@redhat.com>2013-10-23 10:09:56 +0100
commit9e3396ae42d52c5cf4064af3e7c1baffb039ff54 (patch)
tree36da939c4cadf3a53bfd2177a97530b3f26a860a /drivers/gpu/drm/armada
parent5e4e3ba997af8c756c23ffaa86652d3a4df5bdfa (diff)
parent796c8e1c3439aa6f2aef75d767defa0243ed6ead (diff)
downloadop-kernel-dev-9e3396ae42d52c5cf4064af3e7c1baffb039ff54.zip
op-kernel-dev-9e3396ae42d52c5cf4064af3e7c1baffb039ff54.tar.gz
Merge branch 'drm-tda998x-3.12-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into drm-next
Fix build on non-ARM * 'drm-tda998x-3.12-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox: DRM: Armada: depend on ARM
Diffstat (limited to 'drivers/gpu/drm/armada')
-rw-r--r--drivers/gpu/drm/armada/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/armada/Kconfig b/drivers/gpu/drm/armada/Kconfig
index 87e62dd..40d3715 100644
--- a/drivers/gpu/drm/armada/Kconfig
+++ b/drivers/gpu/drm/armada/Kconfig
@@ -1,6 +1,6 @@
config DRM_ARMADA
tristate "DRM support for Marvell Armada SoCs"
- depends on DRM && HAVE_CLK
+ depends on DRM && HAVE_CLK && ARM
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
OpenPOWER on IntegriCloud