diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-10-23 05:09:56 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-10-23 05:09:56 -0400 |
| commit | 9e3396ae42d52c5cf4064af3e7c1baffb039ff54 (patch) | |
| tree | 36da939c4cadf3a53bfd2177a97530b3f26a860a /drivers/gpu | |
| parent | 5e4e3ba997af8c756c23ffaa86652d3a4df5bdfa (diff) | |
| parent | 796c8e1c3439aa6f2aef75d767defa0243ed6ead (diff) | |
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')
| -rw-r--r-- | drivers/gpu/drm/armada/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/armada/Kconfig b/drivers/gpu/drm/armada/Kconfig index 87e62dd4431d..40d371521fe1 100644 --- a/drivers/gpu/drm/armada/Kconfig +++ b/drivers/gpu/drm/armada/Kconfig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | config DRM_ARMADA | 1 | config DRM_ARMADA |
| 2 | tristate "DRM support for Marvell Armada SoCs" | 2 | tristate "DRM support for Marvell Armada SoCs" |
| 3 | depends on DRM && HAVE_CLK | 3 | depends on DRM && HAVE_CLK && ARM |
| 4 | select FB_CFB_FILLRECT | 4 | select FB_CFB_FILLRECT |
| 5 | select FB_CFB_COPYAREA | 5 | select FB_CFB_COPYAREA |
| 6 | select FB_CFB_IMAGEBLIT | 6 | select FB_CFB_IMAGEBLIT |