diff options
| author | Rob Herring <robh@kernel.org> | 2016-10-11 13:54:38 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2017-03-31 17:21:28 +0200 |
| commit | 55c20761453ed9b2d22f5c5101c3833dc1a7159a (patch) | |
| tree | 6f500dfe5c815f6a7dac5aa0fb400843ebff5cfc /android/configs/android-base.cfg | |
| parent | a08cafa7e09cb5450a2596e6ea15bdea976d8d59 (diff) | |
config: android: move device mapper options to recommended
CONFIG_MD is in recommended, but other dependent options like DM_CRYPT and
DM_VERITY options are in base. The result is the options in base don't
get enabled when applying both base and recommended fragments. Move all
the options to recommended.
Link: http://lkml.kernel.org/r/20160908185934.18098-1-robh@kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Acked-by: John Stultz <john.stultz@linaro.org>
Cc: Amit Pundir <amit.pundir@linaro.org>
Cc: Dmitry Shmidt <dimitrysh@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit f023a3956f273859ed36f624f75a66c272124b16)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'android/configs/android-base.cfg')
| -rw-r--r-- | android/configs/android-base.cfg | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/android/configs/android-base.cfg b/android/configs/android-base.cfg index d1f9628e4377..59d4908b3343 100644 --- a/android/configs/android-base.cfg +++ b/android/configs/android-base.cfg @@ -13,7 +13,6 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y CONFIG_ARMV8_DEPRECATED=y CONFIG_ASHMEM=y CONFIG_AUDIT=y -CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_INITRD=y CONFIG_CGROUPS=y CONFIG_CGROUP_CPUACCT=y @@ -21,9 +20,6 @@ CONFIG_CGROUP_DEBUG=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_SCHED=y CONFIG_CP15_BARRIER_EMULATION=y -CONFIG_DM_CRYPT=y -CONFIG_DM_VERITY=y -CONFIG_DM_VERITY_FEC=y CONFIG_EMBEDDED=y CONFIG_FB=y CONFIG_HARDENED_USERCOPY=y |