summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorKyle McMartin <kyle@redhat.com>2011-10-27 12:16:48 -0400
committerKyle McMartin <kyle@redhat.com>2011-10-27 12:16:48 -0400
commitd87b3f2e6e55ccfbd42d03534fa2ffa8a5aa2136 (patch)
treec5076993bf5c48d1b44bcff91e9dd5f4f5075f5f /config-generic
parent080adf836d64c052122f89deaf20da0555288387 (diff)
downloadkernel-d87b3f2e6e55ccfbd42d03534fa2ffa8a5aa2136.tar.gz
kernel-d87b3f2e6e55ccfbd42d03534fa2ffa8a5aa2136.tar.xz
kernel-d87b3f2e6e55ccfbd42d03534fa2ffa8a5aa2136.zip
don't set DEBUG_BLK_CGROUP twice, it'll be toggled by debug/release
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic1
1 files changed, 0 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index ea9b535c4..930edfd47 100644
--- a/config-generic
+++ b/config-generic
@@ -4013,7 +4013,6 @@ CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y # XXX disabled by default, pass 'swapaccount'
# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_SYSFS_DEPRECATED_V2 is not set