diff options
author | 2016-11-07 19:16:51 -0800 | |
---|---|---|
committer | 2016-11-07 19:16:51 -0800 | |
commit | 883bb0c3b69c1d32e0a819b4972c1565aeafcdb0 (patch) | |
tree | fbaf064c60ee782a076db1fedbf7f3ddb12dcb56 | |
parent | Merge tag 'sti-defconfig-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into next/defconfig (diff) | |
parent | ARM: shmobile: defconfig: Enable CONFIG_CGROUPS (diff) | |
download | wireguard-linux-883bb0c3b69c1d32e0a819b4972c1565aeafcdb0.tar.xz wireguard-linux-883bb0c3b69c1d32e0a819b4972c1565aeafcdb0.zip |
Merge tag 'renesas-defconfig-for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig
Renesas ARM Based SoC Defconfig Updates for v4.10
* Enable cgroups in shmobile_defconfig
* tag 'renesas-defconfig-for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: defconfig: Enable CONFIG_CGROUPS
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | arch/arm/configs/shmobile_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index baa07a46a88b..1b0f8ae36fb3 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -2,6 +2,7 @@ CONFIG_SYSVIPC=y CONFIG_NO_HZ=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y +CONFIG_CGROUPS=y CONFIG_BLK_DEV_INITRD=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL_SYSCALL=y |