diff -u linux-4.6.0/debian.master/config/arm64/config.common.arm64 linux-4.6.0/debian.master/config/arm64/config.common.arm64
--- linux-4.6.0/debian.master/config/arm64/config.common.arm64
+++ linux-4.6.0/debian.master/config/arm64/config.common.arm64
@@ -22,7 +22,6 @@
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-# CONFIG_ARCH_ROCKCHIP is not set
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 # CONFIG_ARCH_TEGRA is not set
diff -u linux-4.6.0/debian.master/config/armhf/config.common.armhf linux-4.6.0/debian.master/config/armhf/config.common.armhf
--- linux-4.6.0/debian.master/config/armhf/config.common.armhf
+++ linux-4.6.0/debian.master/config/armhf/config.common.armhf
@@ -17,7 +17,6 @@
 CONFIG_ARCH_MMAP_RND_BITS_MAX=16
 CONFIG_ARCH_MMAP_RND_BITS_MIN=8
 CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
-CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 CONFIG_ARCNET=m
diff -u linux-4.6.0/debian.master/config/config.common.ubuntu linux-4.6.0/debian.master/config/config.common.ubuntu
--- linux-4.6.0/debian.master/config/config.common.ubuntu
+++ linux-4.6.0/debian.master/config/config.common.ubuntu
@@ -418,6 +418,7 @@
 CONFIG_ARCH_RENESAS=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_ARCH_RMOBILE=y
+CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_S3C24XX is not set
 # CONFIG_ARCH_S5PV210 is not set