diff options
author | Olof Johansson <olof@lixom.net> | 2016-11-07 19:16:51 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2016-11-07 19:16:51 -0800 |
commit | 883bb0c3b69c1d32e0a819b4972c1565aeafcdb0 (patch) | |
tree | fbaf064c60ee782a076db1fedbf7f3ddb12dcb56 /arch/arm/configs | |
parent | 86867bad9cb1f4ef0ea6fdde8780ea919e7bea23 (diff) | |
parent | a604a37d46b80899d5a09d937fdd670e93af690d (diff) |
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>
Diffstat (limited to 'arch/arm/configs')
-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 |