projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.3/blkcg' of git://git.kernel.dk/linux-block
[cascardo/linux.git]
/
include
/
linux
/
cgroup_subsys.h
diff --git
a/include/linux/cgroup_subsys.h
b/include/linux/cgroup_subsys.h
index
1f36945
..
1a96fda
100644
(file)
--- a/
include/linux/cgroup_subsys.h
+++ b/
include/linux/cgroup_subsys.h
@@
-27,7
+27,7
@@
SUBSYS(cpuacct)
#endif
#if IS_ENABLED(CONFIG_BLK_CGROUP)
-SUBSYS(
blk
io)
+SUBSYS(io)
#endif
#if IS_ENABLED(CONFIG_MEMCG)