Skip to content

Commit 2096d6f

Browse files
Linus Walleijarndb
authored andcommitted
ARM: configs: Update Integrator defconfig
This updates the Integrator defconfig for the changes in the v5.14-rc1 kernel: - The Framebuffer CONFIG_FB needs to be explicitly selected or we don't get any framebuffer anymore. DRM has stopped to select FB because of circular dependency. - Drop the unused Matrox FB drivers that are only used with specific PCI cards. Fixes: f611b1e ("drm: Avoid circular dependencies for CONFIG_FB") Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Reviewed-by: Kees Cook <keescook@chromium.org> Cc: Kees Cook <keescook@chromium.org> Link: https://lore.kernel.org/r/20210714122703.212609-1-linus.walleij@linaro.org' Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent 2526112 commit 2096d6f

1 file changed

Lines changed: 1 addition & 4 deletions

File tree

arch/arm/configs/integrator_defconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,7 @@ CONFIG_DRM=y
5757
CONFIG_DRM_DISPLAY_CONNECTOR=y
5858
CONFIG_DRM_SIMPLE_BRIDGE=y
5959
CONFIG_DRM_PL111=y
60-
CONFIG_FB_MODE_HELPERS=y
61-
CONFIG_FB_MATROX=y
62-
CONFIG_FB_MATROX_MILLENIUM=y
63-
CONFIG_FB_MATROX_MYSTIQUE=y
60+
CONFIG_FB=y
6461
CONFIG_BACKLIGHT_CLASS_DEVICE=y
6562
# CONFIG_VGA_CONSOLE is not set
6663
CONFIG_LOGO=y

0 commit comments

Comments
 (0)