From: Thierry Reding <treding@nvidia.com>
Date: Fri, 25 Oct 2013 09:32:10 +0000 (+0200)
Subject: Merge remote-tracking branch 'drm-tegra/drm/for-next'
X-Git-Tag: next-20131025~57
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7558c8ba1088d7284f785d5109f63ae6d8772e29;p=karo-tx-linux.git

Merge remote-tracking branch 'drm-tegra/drm/for-next'

Conflicts:
	drivers/gpu/drm/tegra/Kconfig
---

7558c8ba1088d7284f785d5109f63ae6d8772e29
diff --cc drivers/gpu/drm/tegra/Kconfig
index 0f36ddd74e87,0f711424e690..da34dd1b9ddb
--- a/drivers/gpu/drm/tegra/Kconfig
+++ b/drivers/gpu/drm/tegra/Kconfig
@@@ -1,8 -1,10 +1,11 @@@
  config DRM_TEGRA
  	bool "NVIDIA Tegra DRM"
+ 	depends on ARCH_TEGRA || ARCH_MULTIPLATFORM
  	depends on DRM
+ 	select TEGRA_HOST1X
  	select DRM_KMS_HELPER
 +	select DRM_KMS_FB_HELPER
+ 	select DRM_PANEL
  	select FB_SYS_FILLRECT
  	select FB_SYS_COPYAREA
  	select FB_SYS_IMAGEBLIT