diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2016-07-07 14:44:34 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-07 14:44:34 +0200 |
| commit | 0c789933d231acf650f93aa630fe0db257f1738c (patch) | |
| tree | 357a19bf2f2e5bbf1f728f1fa601d8b0994a4e4f | |
| parent | Merge tag 'at91-ab-4.8-defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/defconfig (diff) | |
| parent | ARM: sunxi: Enable sun4i DRM driver (diff) | |
| download | wireguard-linux-0c789933d231acf650f93aa630fe0db257f1738c.tar.xz wireguard-linux-0c789933d231acf650f93aa630fe0db257f1738c.zip | |
Merge tag 'sunxi-defconfig-for-4.8' of https://git.kernel.org/pub/scm/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
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/sunxi_defconfig | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 29e84c3f6e67..8d189350e8ba 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -583,6 +583,7 @@ CONFIG_DRM_ATMEL_HLCDC=m 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 diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig index 81a1b92fd4e6..714da336ec86 100644 --- a/arch/arm/configs/sunxi_defconfig +++ b/arch/arm/configs/sunxi_defconfig @@ -97,6 +97,8 @@ CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_RC_SUPPORT=y CONFIG_RC_DEVICES=y CONFIG_IR_SUNXI=y +CONFIG_DRM=y +CONFIG_DRM_SUN4I=y CONFIG_FB=y CONFIG_FB_SIMPLE=y CONFIG_FRAMEBUFFER_CONSOLE=y |