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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[cascardo/linux.git]
/
net
/
sched
/
cls_cgroup.c
diff --git
a/net/sched/cls_cgroup.c
b/net/sched/cls_cgroup.c
index
37dff78
..
d49c40f
100644
(file)
--- a/
net/sched/cls_cgroup.c
+++ b/
net/sched/cls_cgroup.c
@@
-34,8
+34,6
@@
struct cgroup_subsys net_cls_subsys = {
.populate = cgrp_populate,
#ifdef CONFIG_NET_CLS_CGROUP
.subsys_id = net_cls_subsys_id,
-#else
-#define net_cls_subsys_id net_cls_subsys.subsys_id
#endif
.module = THIS_MODULE,
};