projects / platform / kernel / linux-amlogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d1bafe5)
ANDROID: fix up missing android-base.cfg option
authorJin Qian <jinqian@google.com>
Wed, 11 Jan 2017 00:11:07 +0000 (16:11 -0800)
committerGreg Kroah-Hartman <gregkh@google.com>
Sat, 1 Apr 2017 17:02:01 +0000 (19:02 +0200)
This ports 6a61b529b4a92817adfb1d1393c6b914419a4555 to 4.9-common, where
the the cfg option was missed.

Cc: Jin Qian <jinqian@google.com>
Bug: 34198239
(cherry picked from commit 6a61b529b4a92817adfb1d1393c6b914419a4555)
[the config option was missed in 4.9, this syncs it back up - gregkh]
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
kernel/configs/android-base.config patch | blob | history

diff --git a/kernel/configs/android-base.config b/kernel/configs/android-base.config
index 72d2ef8..1ff32af 100644 (file)
--- a/kernel/configs/android-base.config
+++ b/kernel/configs/android-base.config
@@ -155,6 +155,7 @@ CONFIG_STAGING=y
 CONFIG_SWP_EMULATION=y
 CONFIG_SYNC=y
 CONFIG_TUN=y
+CONFIG_UID_SYS_STATS=y
 CONFIG_UNIX=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_CONFIGFS=y
Domain: System / Kernel;