diff options
| author | Tony Lindgren <tony@atomide.com> | 2021-01-15 12:48:43 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2021-01-15 12:48:43 +0200 |
| commit | 715a1284d89a740b197b3bad5eb20d36a397382f (patch) | |
| tree | 07ad2960ab66e56b3d1e151036262019a18e3df1 /arch/arm/configs/pxa3xx_defconfig | |
| parent | 181739822cf6f8f4e12b173913af2967a28906c0 (diff) | |
| parent | 06862d789ddde8a99c1e579e934ca17c15a84755 (diff) | |
| download | linux-715a1284d89a740b197b3bad5eb20d36a397382f.tar.gz linux-715a1284d89a740b197b3bad5eb20d36a397382f.tar.bz2 linux-715a1284d89a740b197b3bad5eb20d36a397382f.zip | |
Merge branch 'cpuidle-fix' into fixes
Diffstat (limited to 'arch/arm/configs/pxa3xx_defconfig')
| -rw-r--r-- | arch/arm/configs/pxa3xx_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/pxa3xx_defconfig b/arch/arm/configs/pxa3xx_defconfig index 06bbc7a59b60..f0c34017f2aa 100644 --- a/arch/arm/configs/pxa3xx_defconfig +++ b/arch/arm/configs/pxa3xx_defconfig @@ -74,7 +74,6 @@ CONFIG_FB_PXA=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_TDO24M=y CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_DA903X=y # CONFIG_VGA_CONSOLE is not set CONFIG_FRAMEBUFFER_CONSOLE=y |