diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2021-07-14 14:27:03 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-07-16 23:01:59 +0200 |
| commit | 2096d6feec8359203de406c424242dcb977fe1d1 (patch) | |
| tree | 42fce6cf081dcce8c732deb44e6ad29b3bee429d /arch/arm | |
| parent | 2526112b681b587c469ccc5039b5d5be0ae3b5ed (diff) | |
| download | linux-rpi-2096d6feec8359203de406c424242dcb977fe1d1.tar.gz linux-rpi-2096d6feec8359203de406c424242dcb977fe1d1.tar.bz2 linux-rpi-2096d6feec8359203de406c424242dcb977fe1d1.zip | |
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: f611b1e7624c ("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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/integrator_defconfig | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/configs/integrator_defconfig b/arch/arm/configs/integrator_defconfig index b06e537d5149..4dfe321a79f6 100644 --- a/arch/arm/configs/integrator_defconfig +++ b/arch/arm/configs/integrator_defconfig @@ -57,10 +57,7 @@ CONFIG_DRM=y CONFIG_DRM_DISPLAY_CONNECTOR=y CONFIG_DRM_SIMPLE_BRIDGE=y CONFIG_DRM_PL111=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_MATROX=y -CONFIG_FB_MATROX_MILLENIUM=y -CONFIG_FB_MATROX_MYSTIQUE=y +CONFIG_FB=y CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_VGA_CONSOLE is not set CONFIG_LOGO=y |