diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
| commit | 709334c87dbdb44150ce436b3d13c814db0dcae9 (patch) | |
| tree | 5861a45f70c1f283720337abd864498f5afb3dbe /include/linux/cgroup_subsys.h | |
| parent | 0d64b568fcd48b133721c1d322e7c51d85eb12df (diff) | |
| parent | f74890277a196949e4004fe2955e1d4fb3930f98 (diff) | |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
Diffstat (limited to 'include/linux/cgroup_subsys.h')
| -rw-r--r-- | include/linux/cgroup_subsys.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h index 9c8d31bacf46..ccefff02b6cb 100644 --- a/include/linux/cgroup_subsys.h +++ b/include/linux/cgroup_subsys.h | |||
| @@ -60,3 +60,9 @@ SUBSYS(net_cls) | |||
| 60 | #endif | 60 | #endif |
| 61 | 61 | ||
| 62 | /* */ | 62 | /* */ |
| 63 | |||
| 64 | #ifdef CONFIG_BLK_CGROUP | ||
| 65 | SUBSYS(blkio) | ||
| 66 | #endif | ||
| 67 | |||
| 68 | /* */ | ||