diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-11 09:47:53 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-11 09:47:53 +0000 |
| commit | 943550a24c51bdd971f579200f286241548deaf7 (patch) | |
| tree | 4b275941890744cf4ea588ea59db7cd6558647b6 /android/configs/android-base.cfg | |
| parent | 0356888ad14044efe98b16a731ba56d74b89269e (diff) | |
| parent | a3b71254e95dc167ddca600c0ca426e8ce2fad3f (diff) | |
Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/jstultz/android into linux-linaro-lsk-androidlsk-android-14.03
Conflicts:
arch/arm64/include/asm/cmpxchg.h
drivers/cpufreq/cpufreq.c
include/net/tcp.h
net/ipv4/ping.c
net/ipv4/sysctl_net_ipv4.c
net/netfilter/xt_qtaguid.c
Diffstat (limited to 'android/configs/android-base.cfg')
| -rw-r--r-- | android/configs/android-base.cfg | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/android/configs/android-base.cfg b/android/configs/android-base.cfg index 00c99e1f3b1f..04c7148cf637 100644 --- a/android/configs/android-base.cfg +++ b/android/configs/android-base.cfg @@ -16,6 +16,7 @@ CONFIG_CGROUP_DEBUG=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_SCHED=y CONFIG_DM_CRYPT=y +CONFIG_DM_VERITY=y CONFIG_EMBEDDED=y CONFIG_FB=y CONFIG_HIGH_RES_TIMERS=y @@ -34,8 +35,8 @@ CONFIG_IPV6_MIP6=y CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_OPTIMISTIC_DAD=y CONFIG_IPV6_PRIVACY=y -CONFIG_IPV6_ROUTE_INFO=y CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_NF_ARPFILTER=y |