diff options
| author | Olof Johansson <olof@lixom.net> | 2016-11-19 01:28:02 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-11-19 01:28:02 +0100 |
| commit | 7f9b2b150657f2a6d697233b88c9a0d8e1eb16ca (patch) | |
| tree | 0ffff06ac3daa68baa00c55211364fef61523a30 | |
| parent | Merge tag 'imx-defconfig-4.10' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | ARM: multi_v7: enable VGA bridge (diff) | |
| download | linux-7f9b2b150657f2a6d697233b88c9a0d8e1eb16ca.tar.xz linux-7f9b2b150657f2a6d697233b88c9a0d8e1eb16ca.zip | |
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>
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/sunxi_defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 8da1eb073a49..837211ce90e8 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -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 diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig index 714da336ec86..dfeee5c51b40 100644 --- a/arch/arm/configs/sunxi_defconfig +++ b/arch/arm/configs/sunxi_defconfig @@ -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 |