projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'origin/develop-3.0-rk2928' into develop-3.0
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
configs
/
rk30_ds1001b_defconfig
diff --git
a/arch/arm/configs/rk30_ds1001b_defconfig
b/arch/arm/configs/rk30_ds1001b_defconfig
index b45a61f2dfcf9489f0d3d15897b21cd999a6c9ac..b95b19713bab3a01d3a68e304c75a9524b6e4043 100644
(file)
--- a/
arch/arm/configs/rk30_ds1001b_defconfig
+++ b/
arch/arm/configs/rk30_ds1001b_defconfig
@@
-276,7
+276,7
@@
CONFIG_DISPLAY_SUPPORT=y
CONFIG_LCD_B101EW05=y
CONFIG_FB_ROCKCHIP=y
CONFIG_LCDC_RK30=y
-CONFIG_
HDMI_RK30
=y
+CONFIG_
RK_HDMI
=y
CONFIG_RGA_RK30=y
CONFIG_LOGO=y
# CONFIG_LOGO_LINUX_MONO is not set