Skip to content

Commit

Permalink
Merge branch 'drm-tda998x-3.12-fixes' of git://ftp.arm.linux.org.uk/~…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
Dave Airlie committed Oct 23, 2013
2 parents 5e4e3ba + 796c8e1 commit 9e3396a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/armada/Kconfig
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 9e3396a

Please sign in to comment.