Merge branch 'linus' into x86/urgent

[linux-2.6-omap-h63xx.git] / include / net / pkt_cls.h

diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index aa9e282db4855ffe0733f72f6e25b3cc89b913bc..d1ca3144464438f6ba1dc442ec36315d6f7e195f 100644 (file)
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -246,7 +246,7 @@ struct tcf_ematch_ops
 };
 
 extern int tcf_em_register(struct tcf_ematch_ops *);
-extern int tcf_em_unregister(struct tcf_ematch_ops *);
+extern void tcf_em_unregister(struct tcf_ematch_ops *);
 extern int tcf_em_tree_validate(struct tcf_proto *, struct nlattr *,
                                struct tcf_ematch_tree *);
 extern void tcf_em_tree_destroy(struct tcf_proto *, struct tcf_ematch_tree *);