diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-11 13:24:45 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-11 13:24:45 -0400 |
| commit | 438145c7ef5c9445f25bb8fc4d52e2c9d11fdc7c (patch) | |
| tree | 76941991e36f4a32bf1be0db3854959053f24619 /net/sched | |
| parent | 9ddd1b8ad8abd321964b8add5581910de6d67c2a (diff) | |
Update from 2.6.36 to 2.6.36.4wip-dissipation-jerickso
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/cls_cgroup.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c index 78ef2c5e130b..08be223fb3dc 100644 --- a/net/sched/cls_cgroup.c +++ b/net/sched/cls_cgroup.c | |||
| @@ -34,8 +34,6 @@ struct cgroup_subsys net_cls_subsys = { | |||
| 34 | .populate = cgrp_populate, | 34 | .populate = cgrp_populate, |
| 35 | #ifdef CONFIG_NET_CLS_CGROUP | 35 | #ifdef CONFIG_NET_CLS_CGROUP |
| 36 | .subsys_id = net_cls_subsys_id, | 36 | .subsys_id = net_cls_subsys_id, |
| 37 | #else | ||
| 38 | #define net_cls_subsys_id net_cls_subsys.subsys_id | ||
| 39 | #endif | 37 | #endif |
| 40 | .module = THIS_MODULE, | 38 | .module = THIS_MODULE, |
| 41 | }; | 39 | }; |