summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-08-22 17:47:21 +0200
committerArnd Bergmann <arnd@arndb.de>2017-08-22 17:47:21 +0200
commit02fba04ebf78f02ca83b7727779f0df4cd2a7f00 (patch)
tree4810fb8d49fe0cd43ada0f4653d665266b07cb28
parentMerge tag 'tegra-for-4.14-arm-defconfig' of git://git.kernel.org/pub/scm/linu... (diff)
parentARM: davinci_all_defconfig: enable tinydrm and ST7586 (diff)
downloadlinux-02fba04ebf78f02ca83b7727779f0df4cd2a7f00.tar.xz
linux-02fba04ebf78f02ca83b7727779f0df4cd2a7f00.zip
Merge tag 'davinci-for-v4.14/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/defconfig
Pull "Enable driver for display used on Lego Mindstorms EV3" from Sekhar Nori: * tag 'davinci-for-v4.14/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci_all_defconfig: enable tinydrm and ST7586
-rw-r--r--arch/arm/configs/davinci_all_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig
index 06e2e2a1a9be..27d9720f7207 100644
--- a/arch/arm/configs/davinci_all_defconfig
+++ b/arch/arm/configs/davinci_all_defconfig
@@ -143,6 +143,8 @@ CONFIG_VIDEO_ADV7343=m
CONFIG_DRM=m
CONFIG_DRM_TILCDC=m
CONFIG_DRM_DUMB_VGA_DAC=m
+CONFIG_DRM_TINYDRM=m
+CONFIG_TINYDRM_ST7586=m
CONFIG_FB=y
CONFIG_FIRMWARE_EDID=y
CONFIG_FB_DA8XX=y