arm64: rockchip_defconfig: merge android config

enable CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG and CONFIG_UID_CPUTIME

Change-Id: I1db112c2ead7fdffaefe5e0e6dfa5800574d6f13
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

diff --git a/arch/arm64/configs/rockchip_defconfig b/arch/arm64/configs/rockchip_defconfig
index 1aa14f7e1fd97ca785c41598b275494549bdaa01..71c436274219bb9b00bd5ca44de2cc1517ac9d8a 100644 (file)
--- a/arch/arm64/configs/rockchip_defconfig
+++ b/arch/arm64/configs/rockchip_defconfig
@@ -143,6 +143,7 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
 CONFIG_NETFILTER_XT_MATCH_QTAGUID=y
 CONFIG_NETFILTER_XT_MATCH_QUOTA=y
 CONFIG_NETFILTER_XT_MATCH_QUOTA2=y
+CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y
 CONFIG_NETFILTER_XT_MATCH_SOCKET=y
 CONFIG_NETFILTER_XT_MATCH_STATE=y
 CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
@@ -209,6 +210,7 @@ CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_SRAM=y
+CONFIG_UID_CPUTIME=y
 CONFIG_ROCKCHIP_SCR=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y