diff options
| author |   Olof Johansson <olof@lixom.net> | 2018-06-11 16:39:23 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-06-11 16:39:23 -0700 |
| commit | 958da6e3ff446fe558bdf0fd06fb2713539ebeef (patch) | |
| tree | 271eab1abfa5ad47749403b43265ceb2100cb12d /arch/arm/configs/exynos_defconfig | |
| parent | Merge tag 'pxa-for-4.18' of https://github.com/rjarzmik/linux into next/soc (diff) | |
| parent | Merge tag 'renesas-defconfig-for-v4.18' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig (diff) | |
| download | linux-dev-958da6e3ff446fe558bdf0fd06fb2713539ebeef.tar.xz linux-dev-958da6e3ff446fe558bdf0fd06fb2713539ebeef.zip | |
Merge branch 'next/defconfig' into next/soc
Merging in defconfig updates. It's useful to keep them separate during
development but little point in merging them upstream on their own.
* next/defconfig: (40 commits)
arm64: defconfig: Enable PCIe on msm8996 and db820c
arm64: defconfig: Enable HISILICON_LPC
arm64: defconfig: enable drivers for Poplar support
arm64: defconfig: Enable UFS on msm8996
arm64: defconfig: enable the Armada thermal driver
ARM: multi_v7_defconfig: Enable RENESAS_WDT
ARM: shmobile: defconfig: Enable RENESAS_WDT_GEN
arm64: defconfig: enable R8A77990 SoC
ARM: multi_v7_defconfig: Add STM32F7 I2C & STM32 USBPHYC support
arm64: defconfig: Increase CMA size for VC4
arm64: defconfig: enable rockchip efuse
ARM: imx_v6_v7_defconfig: Select CONFIG_GPIO_MAX732X by default
ARM: imx_v6_v7_defconfig: enable imx6sll by default
arm64: defconfig: Enable CONFIG_SND_AUDIO_GRAPH_CARD
arm64: defconfig: makes SND_SIMPLE_CARD to module
ARM: multi_v7_defconfig: enable the Meson PWM controller
arm: multi_v7_defconfig: enable the Amlogic Meson I2C driver
arm64: defconfig: enable CONFIG_SPI_ARMADA_3700
arm64: defconfig: Enable CONFIG_PINCTRL_MT7622 by default
arm64: defconfig: Enable bluetooth USB support
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs/exynos_defconfig')
| -rw-r--r-- | arch/arm/configs/exynos_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig index 629189c62fd1..85b2369d6b20 100644 --- a/arch/arm/configs/exynos_defconfig +++ b/arch/arm/configs/exynos_defconfig @@ -208,6 +208,7 @@ CONFIG_DRM_EXYNOS_DSI=y CONFIG_DRM_EXYNOS_HDMI=y CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_PANEL_SAMSUNG_LD9040=y +CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=y CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=y CONFIG_DRM_NXP_PTN3460=y CONFIG_DRM_PARADE_PS8622=y |