summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-09-03 09:56:49 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-09-03 09:56:49 -0400
commit55d5380c9143600ac8d56de9dc303f7e68f3c3bf (patch)
treeec8192d4d4a69c039bb76ce914f5397920adfc4e /config-generic
parent57fb188fcaabe72f0a210301e3554c39af9936de (diff)
downloadkernel-55d5380c9143600ac8d56de9dc303f7e68f3c3bf.tar.gz
kernel-55d5380c9143600ac8d56de9dc303f7e68f3c3bf.tar.xz
kernel-55d5380c9143600ac8d56de9dc303f7e68f3c3bf.zip
Linux v4.2-4507-g1e1a4e8f4391
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic3
1 files changed, 3 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index c10793af4..d6b235dce 100644
--- a/config-generic
+++ b/config-generic
@@ -321,6 +321,8 @@ CONFIG_MTD_CFI_I2=y
# CONFIG_MTD_NAND_ECC_BCH is not set
# CONFIG_MTD_NAND_DISKONCHIP is not set
# CONFIG_MTD_NAND_HISI504 is not set
+# CONFIG_MTD_NAND_DENALI_PCI is not set
+# CONFIG_MTD_NAND_DENALI_DT is not set
# CONFIG_MTD_LPDDR is not set
CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
@@ -4889,6 +4891,7 @@ CONFIG_CGROUPS=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_CGROUP_DEVICE=y
CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_PIDS=y
CONFIG_CGROUP_SCHED=y
CONFIG_MEMCG=y
CONFIG_MEMCG_SWAP=y