From: Huang, Tao Date: Sat, 6 May 2017 09:23:51 +0000 (+0800) Subject: ARM: rockchip_defconfig: rename UID_CPUTIME to UID_SYS_STATS X-Git-Tag: release-20171130_firefly~4^2~655 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=28ac4628e5b6037ad7386d1ebc529591e6032020;p=firefly-linux-kernel-4.4.55.git ARM: rockchip_defconfig: rename UID_CPUTIME to UID_SYS_STATS 2ea16502ca00 ("ANDROID: uid_sys_stats: rename uid_cputime.c to uid_sys_stats.c") Change-Id: I345f44e510cb0168e9816f7d9adecf5772cdb092 Signed-off-by: Huang, Tao --- diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig index 4d1d01b7ed42..de8261fe29dd 100644 --- a/arch/arm/configs/rockchip_defconfig +++ b/arch/arm/configs/rockchip_defconfig @@ -217,7 +217,7 @@ CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_ROCKCHIP_SCR=y CONFIG_SRAM=y -CONFIG_UID_CPUTIME=y +CONFIG_UID_SYS_STATS=y CONFIG_USB_CAM_GPIO=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y