projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-5.11' into for-linus
[linux-2.6-microblaze.git]
/
arch
/
arm
/
configs
/
davinci_all_defconfig
diff --git
a/arch/arm/configs/davinci_all_defconfig
b/arch/arm/configs/davinci_all_defconfig
index
b5ba8d7
..
e849367
100644
(file)
--- a/
arch/arm/configs/davinci_all_defconfig
+++ b/
arch/arm/configs/davinci_all_defconfig
@@
-158,7
+158,7
@@
CONFIG_VIDEO_TVP514X=m
CONFIG_VIDEO_ADV7343=m
CONFIG_DRM=m
CONFIG_DRM_TILCDC=m
-CONFIG_DRM_
DUMB_VGA_DAC
=m
+CONFIG_DRM_
SIMPLE_BRIDGE
=m
CONFIG_DRM_TINYDRM=m
CONFIG_TINYDRM_ST7586=m
CONFIG_FB=y