summaryrefslogtreecommitdiff
path: root/arch/arm/configs/multi_v7_defconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-07-14 15:11:40 +0200
committerArnd Bergmann <arnd@arndb.de>2016-07-14 15:11:40 +0200
commitfa3533e778d9189d242929a795b438587df69110 (patch)
tree104bf451c28598e6100bea23465aa6ab3a41cf98 /arch/arm/configs/multi_v7_defconfig
parent29d7a6ab10b454918643303991dbe8dc60b36ce3 (diff)
parentafd9dc4562c5838323a3909cc717a8617307c253 (diff)
Merge tag 'sti-defconfig-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into next/defconfig
Merge "STi defconfig updates for v4.8" from Patrice Chotard: - Enable DRM_STI for STMicroelectronics DRM Support - VIDEO_STI_BDISP for STMicroelectronics BDISP 2D * tag 'sti-defconfig-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti: ARM: multi_v7_defconfig: enable STMicroelectronics DRM Support ARM: multi_v7_defconfig: enable STMicroelectronics BDISP 2D blitter driver
Diffstat (limited to 'arch/arm/configs/multi_v7_defconfig')
-rw-r--r--arch/arm/configs/multi_v7_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 8d189350e8ba..7fd209c5ea47 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -555,6 +555,7 @@ CONFIG_VIDEO_EXYNOS4_FIMC_IS=m
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
+CONFIG_VIDEO_STI_BDISP=m
CONFIG_VIDEO_RENESAS_JPU=m
CONFIG_VIDEO_RENESAS_VSP1=m
CONFIG_V4L_TEST_DRIVERS=y
@@ -588,6 +589,7 @@ CONFIG_DRM_TEGRA=y
CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
CONFIG_DRM_PANEL_SIMPLE=y
+CONFIG_DRM_STI=m
CONFIG_DRM_VC4=y
CONFIG_FB_ARMCLCD=y
CONFIG_FB_WM8505=y