From 19b12beb28aea10e01468d09634a86e5cb72e9b0 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed, 3 Nov 2010 13:31:05 +0000
Subject: [PATCH] --- yaml --- r: 221631 b: refs/heads/master c:
 c00b2c9e79466d61979cd21af526cc6d5d0ee04f h: refs/heads/master i:   221629:
 0a59d2b0b7b6d78a0be370eb506f1c284f0f7aad   221627:
 37c4ccdce35af71905f54099ca4e7cd904b41d63   221623:
 a621d88d7f0434671c0a315c653e5ebd2e1c9f8c   221615:
 1c6aa8e395f04fa0dc0e6be583c31471dd7ab792   221599:
 0e128cdae3133ccc79ee6ffc72d6022f72289047   221567:
 372b9b0da3985b20d524335fa12b2c6e733f6a1a v: v3

---
 [refs]                       | 2 +-
 trunk/net/sched/cls_cgroup.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d466997ac08d..d03f2d6b0a15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6331d6f9a4298173b413cf99a40cc86a9d92c37
+refs/heads/master: c00b2c9e79466d61979cd21af526cc6d5d0ee04f
diff --git a/trunk/net/sched/cls_cgroup.c b/trunk/net/sched/cls_cgroup.c
index 37dff78e9cb1..d49c40fb7e09 100644
--- a/trunk/net/sched/cls_cgroup.c
+++ b/trunk/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,
 };