Commit 7f9b2b15 authored Nov 18, 2016 by Olof Johansson

Merge tag 'sunxi-defconfig-for-4.10' of...

Merge tag 'sunxi-defconfig-for-4.10' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/defconfig

Allwinner defconfig changes for 4.10

Two patches to enable the dumb VGA bridges in the multi_v7 and sunxi
defconfig.

* tag 'sunxi-defconfig-for-4.10' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux

:
  ARM: multi_v7: enable VGA bridge
  ARM: sunxi: Enable VGA bridge

Signed-off-by: Olof Johansson <olof@lixom.net>

parents 43d461f1 a0eb3ee3

arch/arm/configs/multi_v7_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -572,6 +572,7 @@ CONFIG_DRM=y
		CONFIG_DRM_I2C_ADV7511=m
		# CONFIG_DRM_I2C_CH7006 is not set
		# CONFIG_DRM_I2C_SIL164 is not set
		CONFIG_DRM_DUMB_VGA_DAC=m
		CONFIG_DRM_NXP_PTN3460=m
		CONFIG_DRM_PARADE_PS8622=m
		CONFIG_DRM_NOUVEAU=m

arch/arm/configs/sunxi_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -98,6 +98,7 @@ CONFIG_MEDIA_RC_SUPPORT=y
		CONFIG_RC_DEVICES=y
		CONFIG_IR_SUNXI=y
		CONFIG_DRM=y
		CONFIG_DRM_DUMB_VGA_DAC=y
		CONFIG_DRM_SUN4I=y
		CONFIG_FB=y
		CONFIG_FB_SIMPLE=y