summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/multi_v7_defconfig
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2018-05-14 13:48:26 -0700
committerOlof Johansson <olof@lixom.net>2018-05-14 13:48:26 -0700
commit51cf0d6c3affe00211fb132d961585a14631d03b (patch)
tree75091c4bd7a5aa0fb393574ef59c53f0b81b1b5d /arch/arm/configs/multi_v7_defconfig
parent96609676a7d3aed728a8859ea96d2fe7eb9f23a5 (diff)
parentb0121046cacdbc99475871aceb2e9e57995c2ba1 (diff)
Merge tag 'samsung-defconfig-4.18' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/defconfig
Samsung defconfig changes for v4.18 1. Enable Samsung S6E63J0X03 DSI panel. * tag 'samsung-defconfig-4.18' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: multi_v7_config: enable S6E63J0X03 panel driver ARM: exynos_defconfig: enable S6E63J0X03 panel driver Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs/multi_v7_defconfig')
-rw-r--r--arch/arm/configs/multi_v7_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 1d1006ed30d2..c2093166cf40 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -643,6 +643,7 @@ CONFIG_DRM_SUN4I=m
CONFIG_DRM_FSL_DCU=m
CONFIG_DRM_TEGRA=y
CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
CONFIG_DRM_PANEL_SIMPLE=y
CONFIG_DRM_SII9234=m