From: Greg Kroah-Hartman <gregkh@google.com>
Date: Tue, 4 Apr 2017 17:46:59 +0000 (+0200)
Subject: ANDROID: android-base.cfg: add CONFIG_MODULES option
X-Git-Tag: release-20171130_firefly~4^2~100^2~160
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=353a964727cfbca134e91134996e2bd9039d792c;p=firefly-linux-kernel-4.4.55.git

ANDROID: android-base.cfg: add CONFIG_MODULES option

This adds CONFIG_MODULES, CONFIG_MODULE_UNLOAD, and CONFIG_MODVERSIONS
which are required by the O release.

Bug: 35803310
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
(cherry picked from commit 56f22e654a311f3c2492b8b3609916265fe34e20)
---

diff --git a/android/configs/android-base.cfg b/android/configs/android-base.cfg
index 7d4ce82f5b8e..59c4f3a0df19 100644
--- a/android/configs/android-base.cfg
+++ b/android/configs/android-base.cfg
@@ -65,6 +65,9 @@ CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_IP_NF_TARGET_NETMAP=y
 CONFIG_IP_NF_TARGET_REDIRECT=y
 CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODVERSIONS=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NETFILTER=y