summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2017-01-03 11:27:15 -0800
committerDmitry Shmidt <dimitrysh@google.com>2017-01-03 11:27:15 -0800
commitdef5e9075cf67b1aa301aa3bcd3b94fad3216caf (patch)
treeb44be1e2a3579d7cd3c8b70ad682e08acf917cff /android
parent94481f7e40b3b3e912f75f78d5e7cfd007a5b7f2 (diff)
parentaceae9be74c70f993ddd8d6a157f1a256591c43f (diff)
Merge remote-tracking branch 'common/android-4.4.y' into android-hikey-linaro-4.4-aosp
Diffstat (limited to 'android')
-rw-r--r--android/configs/android-base.cfg4
1 files changed, 4 insertions, 0 deletions
diff --git a/android/configs/android-base.cfg b/android/configs/android-base.cfg
index 8531a7a79e33..f10371a981b7 100644
--- a/android/configs/android-base.cfg
+++ b/android/configs/android-base.cfg
@@ -139,7 +139,11 @@ CONFIG_PPP_DEFLATE=y
CONFIG_PPP_MPPE=y
CONFIG_PREEMPT=y
CONFIG_PROFILING=y
+CONFIG_QFMT_V2=y
CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+CONFIG_QUOTA_TREE=y
+CONFIG_QUOTACTL=y
CONFIG_RANDOMIZE_BASE=y
CONFIG_RTC_CLASS=y
CONFIG_RT_GROUP_SCHED=y