diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-02-22 22:14:34 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-02-22 22:14:34 +0100 |
| commit | e7a1493e83dbfcf105b234b8283d338f9c6d134a (patch) | |
| tree | c28e2662aadaa7fb4994d300cef48046197449a6 /arch/arm | |
| parent | 292aad16de788e8ff0113325ba8c7a111860c180 (diff) | |
| parent | 1a4aacdeb507da38190e08cec45ef985740e26dc (diff) | |
Merge branch 'arm/defconfig' into for-next
* arm/defconfig:
ARM: defconfig: integrator: Switch to DRM
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/integrator_defconfig | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/configs/integrator_defconfig b/arch/arm/configs/integrator_defconfig index 69cb8f1efcea..747550c7af2f 100644 --- a/arch/arm/configs/integrator_defconfig +++ b/arch/arm/configs/integrator_defconfig @@ -27,6 +27,7 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y CONFIG_CPUFREQ_DT=y +CONFIG_CMA=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y @@ -53,13 +54,17 @@ CONFIG_E100=y CONFIG_SMC91X=y # CONFIG_KEYBOARD_ATKBD is not set # CONFIG_SERIO_SERPORT is not set -CONFIG_FB=y +CONFIG_DRM=y +CONFIG_DRM_DUMB_VGA_DAC=y +CONFIG_DRM_PL111=y CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_ARMCLCD=y CONFIG_FB_MATROX=y CONFIG_FB_MATROX_MILLENIUM=y CONFIG_FB_MATROX_MYSTIQUE=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_VGA_CONSOLE is not set +CONFIG_LOGO=y CONFIG_MMC=y CONFIG_MMC_ARMMMCI=y CONFIG_NEW_LEDS=y |