Merge branch 'drm-tda998x-3.12-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into drm-next · 9e3396ae42 - Gogs

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

Dave Airlie 11 years ago

parent

5e4e3ba997 796c8e1c34

commit

9e3396ae42

1 changed files with 1 additions and 1 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 1
						
drivers/gpu/drm/armada/Kconfig
							 
								View File
							
				@@ -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