summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2021-09-14 18:04:42 +0930
committerJoel Stanley <joel@jms.id.au>2021-09-14 18:08:02 +0930
commit3c8cf108d0f3f008279bb0685fc521695270d121 (patch)
tree6cf22b73e123d7660fe2d2541296981825ef13ee /arch/arm
parent6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f (diff)
downloadlinux-stable-3c8cf108d0f3f008279bb0685fc521695270d121.tar.gz
linux-stable-3c8cf108d0f3f008279bb0685fc521695270d121.tar.bz2
linux-stable-3c8cf108d0f3f008279bb0685fc521695270d121.zip
ARM: configs: aspeed_g5: Reneable DRM_FBDEV_EMULATION
DRM_FBDEV_EMULATION previously selected FB and was default y as long as DRM was enabled. In commit f611b1e7624c ("drm: Avoid circular dependencies for CONFIG_FB") the select was replaced with a depends on FB, disabling DRM_FBDEV_EMULATION for configurations that had it enabled. Fixes: f611b1e7624c ("drm: Avoid circular dependencies for CONFIG_FB") Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/aspeed_g5_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/aspeed_g5_defconfig b/arch/arm/configs/aspeed_g5_defconfig
index 480dbbb4ff91..b602743ff7fd 100644
--- a/arch/arm/configs/aspeed_g5_defconfig
+++ b/arch/arm/configs/aspeed_g5_defconfig
@@ -181,6 +181,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_ASPEED=y
CONFIG_DRM=y
CONFIG_DRM_ASPEED_GFX=y
+CONFIG_FB=y
CONFIG_USB=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_DYNAMIC_MINORS=y