summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2023-09-29 11:01:34 +0200
committerGeert Uytterhoeven <geert@linux-m68k.org>2023-10-06 10:03:04 +0200
commit48ceb35e72683dce009f2b47f6579b0a1f9d9768 (patch)
treecbe10225a043216e916351383c51ae66c65baecb /arch/m68k
parent7e02d701b90eb6b83e8fbcf232711ee67b0cb216 (diff)
downloadlinux-stable-48ceb35e72683dce009f2b47f6579b0a1f9d9768.tar.gz
linux-stable-48ceb35e72683dce009f2b47f6579b0a1f9d9768.tar.bz2
linux-stable-48ceb35e72683dce009f2b47f6579b0a1f9d9768.zip
m68k: defconfig: Update virt_defconfig for v6.6-rc3
- Enable CONFIG_DRM_FBDEV_EMULATION and CONFIG_FB_DEVICE (no longer auto-enabled since commit bb6c4507fe825f1b ("drm: fix up fbdev Kconfig defaults")), - Drop CONFIG_FRAMEBUFFER_CONSOLE=y (auto-enabled since commit bb6c4507fe825f1b ("drm: fix up fbdev Kconfig defaults")). Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Link: https://lore.kernel.org/r/6f30b86b83b972e9902b62295f397a20512d5507.1695977960.git.geert@linux-m68k.org
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/configs/virt_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68k/configs/virt_defconfig b/arch/m68k/configs/virt_defconfig
index 97b4c41c3184..ce725d39e488 100644
--- a/arch/m68k/configs/virt_defconfig
+++ b/arch/m68k/configs/virt_defconfig
@@ -45,8 +45,9 @@ CONFIG_INPUT_EVDEV=y
CONFIG_VIRTIO_CONSOLE=y
CONFIG_HW_RANDOM_VIRTIO=y
CONFIG_DRM=y
+CONFIG_DRM_FBDEV_EMULATION=y
CONFIG_DRM_VIRTIO_GPU=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FB_DEVICE=y
CONFIG_SOUND=y
CONFIG_SND=y
CONFIG_SND_VIRTIO=y