diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-01-31 09:13:14 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-01-31 09:13:14 -0500 |
| commit | ea51e5040e24eefe44d70bc654a237ca1f0225b0 (patch) | |
| tree | df2e5922dcdfafae62a10d8cd97f98121064fc23 /include/linux/cgroup_subsys.h | |
| parent | 3422a47041b8cb8f14ac1e3926bcf711121df6dc (diff) | |
| parent | 8dbd52daee38adaae4d5a674bcca837e694a4f4c (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'include/linux/cgroup_subsys.h')
| -rw-r--r-- | include/linux/cgroup_subsys.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h index ac663c18776c..0bd390ce98b2 100644 --- a/include/linux/cgroup_subsys.h +++ b/include/linux/cgroup_subsys.h | |||
| @@ -59,8 +59,16 @@ SUBSYS(net_cls) | |||
| 59 | SUBSYS(blkio) | 59 | SUBSYS(blkio) |
| 60 | #endif | 60 | #endif |
| 61 | 61 | ||
| 62 | /* */ | ||
| 63 | |||
| 62 | #ifdef CONFIG_CGROUP_PERF | 64 | #ifdef CONFIG_CGROUP_PERF |
| 63 | SUBSYS(perf) | 65 | SUBSYS(perf) |
| 64 | #endif | 66 | #endif |
| 65 | 67 | ||
| 66 | /* */ | 68 | /* */ |
| 69 | |||
| 70 | #ifdef CONFIG_NETPRIO_CGROUP | ||
| 71 | SUBSYS(net_prio) | ||
| 72 | #endif | ||
| 73 | |||
| 74 | /* */ | ||