projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
[firefly-linux-kernel-4.4.55.git]
/
android
/
configs
/
android-recommended.cfg
diff --git
a/android/configs/android-recommended.cfg
b/android/configs/android-recommended.cfg
index 175f7c2c18776596bdeca7340371ec2941c6d83b..ca3cc8613366612ece7b2e3082adf742ba30bdfa 100644
(file)
--- a/
android/configs/android-recommended.cfg
+++ b/
android/configs/android-recommended.cfg
@@
-5,6
+5,7
@@
CONFIG_COMPACTION=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
# CONFIG_INPUT_MOUSE is not set
# CONFIG_LEGACY_PTYS is not set
+# CONFIG_NF_CONNTRACK_SIP is not set
# CONFIG_PM_WAKELOCKS_GC is not set
# CONFIG_VT is not set
CONFIG_ANDROID_RAM_CONSOLE=y