diff options
| author | Zhang Jiejing <jiejing.zhang@freescale.com> | 2011-08-31 19:13:51 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2011-09-05 10:04:04 +0800 |
| commit | c012f94ff9a15a1546ef6fc5ef90e4621866d936 (patch) | |
| tree | 0aac7386eebd5a5ba7f75f139f4775f930220d34 /arch | |
| parent | b630b83192ef8aca736834197fe0b4e062d41ffc (diff) | |
ENGR00155663 Config: Android enable IFSTAT in defconfig.
enable ifstat and activity_stats in android defconfig.
Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/imx5_android_defconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/configs/imx5_android_defconfig b/arch/arm/configs/imx5_android_defconfig index e527681cca83..e2eb295e3fd8 100644 --- a/arch/arm/configs/imx5_android_defconfig +++ b/arch/arm/configs/imx5_android_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.35.3 -# Thu Jul 14 02:10:29 2011 +# Mon Sep 5 10:02:38 2011 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -72,8 +72,7 @@ CONFIG_CGROUP_DEBUG=y CONFIG_CGROUP_NS=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_DEVICE=y -CONFIG_CPUSETS=n -# CONFIG_PROC_PID_CPUSET is not set +# CONFIG_CPUSETS is not set CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y @@ -522,6 +521,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y # CONFIG_IPV6_MROUTE is not set # CONFIG_NETLABEL is not set CONFIG_ANDROID_PARANOID_NETWORK=y +CONFIG_NET_ACTIVITY_STATS=y # CONFIG_NETWORK_SECMARK is not set CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set @@ -888,6 +888,7 @@ CONFIG_MISC_DEVICES=y # CONFIG_TI_DAC7512 is not set CONFIG_ANDROID_PMEM=y CONFIG_UID_STAT=y +CONFIG_IFACE_STAT=y CONFIG_MXS_PERFMON=y # CONFIG_C2PORT is not set |