Merge branch 'for-3.20' of git://linux-nfs.org/~bfields/linux

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / exynos / exynos_drm_drv.c

diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index 1bcbe07cecfc9541a2eba9415c227ae17a9c0449..90168d7cf66a4e9741555e0aa6a51e45e16ac1ba 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -556,6 +556,9 @@ static struct platform_driver *const exynos_drm_kms_drivers[] = {
 #ifdef CONFIG_DRM_EXYNOS_FIMD
        &fimd_driver,
 #endif
+#ifdef CONFIG_DRM_EXYNOS7_DECON
+       &decon_driver,
+#endif
 #ifdef CONFIG_DRM_EXYNOS_DP
        &dp_driver,
 #endif
@@ -612,6 +615,7 @@ static const char * const strings[] = {
        "samsung,exynos3",
        "samsung,exynos4",
        "samsung,exynos5",
+       "samsung,exynos7",
 };
 
 static struct platform_driver exynos_drm_platform_driver = {