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 3d7f8ea4f641cba795695c31498adaeb31367933..b95b19713bab3a01d3a68e304c75a9524b6e4043 100644 (file)
--- a/arch/arm/configs/rk30_ds1001b_defconfig
+++ b/arch/arm/configs/rk30_ds1001b_defconfig
@@ -29,7 +29,6 @@ CONFIG_MACH_RK30_DS1001B=y
 CONFIG_FIQ_DEBUGGER=y
 CONFIG_FIQ_DEBUGGER_NO_SLEEP=y
 CONFIG_FIQ_DEBUGGER_CONSOLE=y
-CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_SMP=y
@@ -277,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