]> git.itanic.dy.fi Git - linux-stable/commitdiff
m68k: defconfig: Update virt_defconfig for v6.6-rc3
authorGeert Uytterhoeven <geert@linux-m68k.org>
Fri, 29 Sep 2023 09:01:34 +0000 (11:01 +0200)
committerGeert Uytterhoeven <geert@linux-m68k.org>
Fri, 6 Oct 2023 08:03:04 +0000 (10:03 +0200)
  - 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
arch/m68k/configs/virt_defconfig

index 97b4c41c3184f08321b83bf1d59cf042bdee13b6..ce725d39e48873c44c13f8117fdbdc324aeff7eb 100644 (file)
@@ -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