From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 7 Jul 2016 12:44:34 +0000 (+0200)
Subject: Merge tag 'sunxi-defconfig-for-4.8' of https://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0c789933d231acf650f93aa630fe0db257f1738c;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'sunxi-defconfig-for-4.8' of https://git./linux/kernel/git/mripard/linux into next/defconfig

Merge "Allwinner defconfig changes for 4.8" from Maxime Ripard:

Two patches to enable the DRM driver in the sunxi and multi_v7 defconfig.

* tag 'sunxi-defconfig-for-4.8' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: sunxi: Enable sun4i DRM driver
  ARM: multi_v7: Enable sun4i DRM driver
---

0c789933d231acf650f93aa630fe0db257f1738c
diff --cc arch/arm/configs/multi_v7_defconfig
index 29e84c3f6e67,42dd0b8f42ee..8d189350e8ba
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -583,8 -552,8 +583,9 @@@ CONFIG_DRM_ATMEL_HLCDC=
  CONFIG_DRM_RCAR_DU=m
  CONFIG_DRM_RCAR_HDMI=y
  CONFIG_DRM_RCAR_LVDS=y
+ CONFIG_DRM_SUN4I=m
  CONFIG_DRM_TEGRA=y
 +CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
  CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
  CONFIG_DRM_PANEL_SIMPLE=y
  CONFIG_DRM_VC4=y