summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2021-06-15 08:13:04 -0700
committerOlof Johansson <olof@lixom.net>2021-06-15 08:13:06 -0700
commita996c70e4d7e08904674d2a65e25303400ac02e5 (patch)
treedf1f1a57021366ee1e2a61d40c1e2aeb8480f240 /arch/arm
parentdfde897bb1d5fe91824ace4aa3ed21c52081fdbe (diff)
parent38f61ef1a0cefb4e3b37c3e7b16c0f68df34a3dc (diff)
downloadlinux-stable-a996c70e4d7e08904674d2a65e25303400ac02e5.tar.gz
linux-stable-a996c70e4d7e08904674d2a65e25303400ac02e5.tar.bz2
linux-stable-a996c70e4d7e08904674d2a65e25303400ac02e5.zip
Merge tag 'samsung-defconfig-5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/defconfig
Samsung defconfig changes for v5.14 1. Enable Exynos Universal Flash Storage (UFS) driver for Exynos7 arm64 boards. 2. Restore framebuffer support in exynos_defconfig. * tag 'samsung-defconfig-5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: exynos_defconfig: restore framebuffer support arm64: defconfig: Enable Exynos UFS driver Link: https://lore.kernel.org/r/20210614193309.20248-3-krzysztof.kozlowski@canonical.com Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/exynos_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig
index 513f56b3c059..f4e1873912a3 100644
--- a/arch/arm/configs/exynos_defconfig
+++ b/arch/arm/configs/exynos_defconfig
@@ -236,6 +236,7 @@ CONFIG_DRM_SII9234=y
CONFIG_DRM_TOSHIBA_TC358764=y
CONFIG_DRM_LIMA=y
CONFIG_DRM_PANFROST=y
+CONFIG_FB=y
CONFIG_LCD_CLASS_DEVICE=y
CONFIG_LCD_PLATFORM=y
CONFIG_BACKLIGHT_PWM=y