diff options
| author | Linaro CI <ci_notify@linaro.org> | 2020-02-26 16:55:08 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2020-02-26 16:55:08 +0000 |
| commit | 0119f1241e3ffd15d77300a22aff3e247fa89273 (patch) | |
| tree | 27f246507d51fb786fb93565916fdcba193884cc /arch | |
| parent | 533a95a84db33be0d72ea51e263b72bf04f434e3 (diff) | |
| parent | e6ec98daec27b86dea8e1a1f043dde38cfb52c5e (diff) | |
Merge remote-tracking branch 'distro.config/tracking-qcomlt-config-fragments' into integration-linux-qcomlt
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/configs/defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index b6546213e900..c04765a36672 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -14,7 +14,6 @@ CONFIG_IKCONFIG_PROC=y CONFIG_NUMA_BALANCING=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y -CONFIG_BLK_CGROUP=y CONFIG_CGROUP_PIDS=y CONFIG_CGROUP_HUGETLB=y CONFIG_CPUSETS=y |