Merge tag 'sunxi-defconfig-for-4.8' of https://git.kernel.org/pub/scm/linux/kernel...

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

diff --cc arch/arm/configs/multi_v7_defconfig
index 29e84c3f6e675809b6740708683f14b41d4a489e,42dd0b8f42eeace877323dfe2bd43687dde8a1c8..8d189350e8ba2fef3fb7c059014a9616c4db1ea8
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/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