diff --git a/[refs] b/[refs]
index aeedc3bb9035..710a50089640 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f2149c1df50c8c712950872675f46e6e44629f0
+refs/heads/master: 8c2152286aabe753519d7627a2992625b97e4b20
diff --git a/trunk/include/net/netprio_cgroup.h b/trunk/include/net/netprio_cgroup.h
index c432e99942af..e503b87c4c1b 100644
--- a/trunk/include/net/netprio_cgroup.h
+++ b/trunk/include/net/netprio_cgroup.h
@@ -18,11 +18,6 @@
 #include <linux/hardirq.h>
 #include <linux/rcupdate.h>
 
-struct cgroup_netprio_state
-{
-	struct cgroup_subsys_state css;
-	u32 prioidx;
-};
 
 struct netprio_map {
 	struct rcu_head rcu;
@@ -32,6 +27,11 @@ struct netprio_map {
 
 #ifdef CONFIG_CGROUPS
 
+struct cgroup_netprio_state {
+	struct cgroup_subsys_state css;
+	u32 prioidx;
+};
+
 #ifndef CONFIG_NETPRIO_CGROUP
 extern int net_prio_subsys_id;
 #endif
@@ -52,14 +52,6 @@ static inline struct cgroup_netprio_state
 #else
 
 #define sock_update_netprioidx(sk)
-#define skb_update_prio(skb)
-
-static inline struct cgroup_netprio_state
-		*task_netprio_state(struct task_struct *p)
-{
-	return NULL;
-}
-
 #endif
 
 #endif  /* _NET_CLS_CGROUP_H */