diff options
| author | Kyle McMartin <kyle@redhat.com> | 2011-10-27 12:16:48 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2011-10-27 12:16:48 -0400 |
| commit | d87b3f2e6e55ccfbd42d03534fa2ffa8a5aa2136 (patch) | |
| tree | c5076993bf5c48d1b44bcff91e9dd5f4f5075f5f | |
| parent | 080adf836d64c052122f89deaf20da0555288387 (diff) | |
| download | kernel-d87b3f2e6e55ccfbd42d03534fa2ffa8a5aa2136.tar.gz kernel-d87b3f2e6e55ccfbd42d03534fa2ffa8a5aa2136.tar.xz kernel-d87b3f2e6e55ccfbd42d03534fa2ffa8a5aa2136.zip | |
don't set DEBUG_BLK_CGROUP twice, it'll be toggled by debug/release
| -rw-r--r-- | config-generic | 1 | ||||
| -rw-r--r-- | kernel.spec | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/config-generic b/config-generic index ea9b535c..930edfd4 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 diff --git a/kernel.spec b/kernel.spec index c8b2898b..3f9feeb0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2021,6 +2021,7 @@ fi - Make some config changes caught during a review: - CONFIG_SOC_CAMERA: disable, it's only for some ARM boards - CONFIG_MEDIA_ALTERA_CI=m: needed for some DVB boards + - CONFIG_DEBUG_BLK_CGROUP: stop setting it twice... * Wed Oct 26 2011 Chuck Ebbert <cebbert@redhat.com> - Add build option "--with=release" to build a non-debug kernel in rawhide. |