From: Huang, Tao Date: Mon, 25 Jul 2016 11:40:03 +0000 (+0800) Subject: arm64: rockchip_defconfig: merge android config X-Git-Tag: firefly_0821_release~2093 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b5f3f14d11bdada12e6ad1a2ebaa395cc3ac6894;p=firefly-linux-kernel-4.4.55.git 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 --- diff --git a/arch/arm64/configs/rockchip_defconfig b/arch/arm64/configs/rockchip_defconfig index 1aa14f7e1fd9..71c436274219 100644 --- 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