diff options
| author | Yifan Hong <elsk@google.com> | 2019-02-26 13:00:41 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-26 13:00:41 -0800 |
| commit | 18f4df849358518eb0fd920619c080fa8602f90b (patch) | |
| tree | ac7853734c1b77a8cc53d190421392b4b1115562 | |
| parent | dcaf9f78af5367c295dbf02da19ec113f803e21e (diff) | |
| parent | a2574332668a7f493e85d0912b4018766aace7a5 (diff) | |
| download | configs-18f4df849358518eb0fd920619c080fa8602f90b.tar.gz | |
Merge "Require CONFIG_MD=y." am: 5783754adb
am: a257433266
Change-Id: I76b7b6c54640e01e569ef14e012e4e5ac3a64410
| -rw-r--r-- | android-4.14/android-base.config | 1 | ||||
| -rw-r--r-- | android-4.14/android-recommended.config | 1 | ||||
| -rw-r--r-- | android-4.19/android-base.config | 1 | ||||
| -rw-r--r-- | android-4.19/android-recommended.config | 1 | ||||
| -rw-r--r-- | android-4.9/android-base.config | 1 | ||||
| -rw-r--r-- | android-4.9/android-recommended.config | 1 |
6 files changed, 3 insertions, 3 deletions
diff --git a/android-4.14/android-base.config b/android-4.14/android-base.config index 13c4e34..e730f31 100644 --- a/android-4.14/android-base.config +++ b/android-4.14/android-base.config @@ -90,6 +90,7 @@ CONFIG_IP_NF_TARGET_REDIRECT=y CONFIG_IP_NF_TARGET_REJECT=y CONFIG_L2TP=y CONFIG_MAGIC_SYSRQ=y +CONFIG_MD=y CONFIG_MEMBARRIER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y diff --git a/android-4.14/android-recommended.config b/android-4.14/android-recommended.config index 7e79923..4b011ac 100644 --- a/android-4.14/android-recommended.config +++ b/android-4.14/android-recommended.config @@ -101,7 +101,6 @@ CONFIG_KSM=y CONFIG_LOGIG940_FF=y CONFIG_LOGIRUMBLEPAD2_FF=y CONFIG_LOGITECH_FF=y -CONFIG_MD=y CONFIG_MEDIA_SUPPORT=y CONFIG_MISC_FILESYSTEMS=y CONFIG_MSDOS_FS=y diff --git a/android-4.19/android-base.config b/android-4.19/android-base.config index 954ce0b..c7fe486 100644 --- a/android-4.19/android-base.config +++ b/android-4.19/android-base.config @@ -87,6 +87,7 @@ CONFIG_IP_NF_TARGET_REDIRECT=y CONFIG_IP_NF_TARGET_REJECT=y CONFIG_L2TP=y CONFIG_MAGIC_SYSRQ=y +CONFIG_MD=y CONFIG_MEMBARRIER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y diff --git a/android-4.19/android-recommended.config b/android-4.19/android-recommended.config index 7bee129..5be18eb 100644 --- a/android-4.19/android-recommended.config +++ b/android-4.19/android-recommended.config @@ -99,7 +99,6 @@ CONFIG_KSM=y CONFIG_LOGIG940_FF=y CONFIG_LOGIRUMBLEPAD2_FF=y CONFIG_LOGITECH_FF=y -CONFIG_MD=y CONFIG_MEDIA_SUPPORT=y CONFIG_MISC_FILESYSTEMS=y CONFIG_MSDOS_FS=y diff --git a/android-4.9/android-base.config b/android-4.9/android-base.config index b477ab8..c85dd06 100644 --- a/android-4.9/android-base.config +++ b/android-4.9/android-base.config @@ -93,6 +93,7 @@ CONFIG_IP_NF_TARGET_REDIRECT=y CONFIG_IP_NF_TARGET_REJECT=y CONFIG_L2TP=y CONFIG_MAGIC_SYSRQ=y +CONFIG_MD=y CONFIG_MEMBARRIER=y CONFIG_MMU=y CONFIG_MODULES=y diff --git a/android-4.9/android-recommended.config b/android-4.9/android-recommended.config index 1245d94..e70b8b7 100644 --- a/android-4.9/android-recommended.config +++ b/android-4.9/android-recommended.config @@ -103,7 +103,6 @@ CONFIG_KSM=y CONFIG_LOGIG940_FF=y CONFIG_LOGIRUMBLEPAD2_FF=y CONFIG_LOGITECH_FF=y -CONFIG_MD=y CONFIG_MEDIA_SUPPORT=y CONFIG_MISC_FILESYSTEMS=y CONFIG_MSDOS_FS=y |