projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[powerpc.git]
/
net
/
sched
/
em_text.c
diff --git
a/net/sched/em_text.c
b/net/sched/em_text.c
index
77beabc
..
e8f4616
100644
(file)
--- a/
net/sched/em_text.c
+++ b/
net/sched/em_text.c
@@
-9,11
+9,9
@@
* Authors: Thomas Graf <tgraf@suug.ch>
*/
* Authors: Thomas Graf <tgraf@suug.ch>
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
-#include <linux/sched.h>
#include <linux/string.h>
#include <linux/skbuff.h>
#include <linux/textsearch.h>
#include <linux/string.h>
#include <linux/skbuff.h>
#include <linux/textsearch.h>
@@
-126,7
+124,7
@@
static int em_text_dump(struct sk_buff *skb, struct tcf_ematch *m)
rtattr_failure:
return -1;
rtattr_failure:
return -1;
-}
+}
static struct tcf_ematch_ops em_text_ops = {
.kind = TCF_EM_TEXT,
static struct tcf_ematch_ops em_text_ops = {
.kind = TCF_EM_TEXT,
@@
-143,7
+141,7
@@
static int __init init_em_text(void)
return tcf_em_register(&em_text_ops);
}
return tcf_em_register(&em_text_ops);
}
-static void __exit exit_em_text(void)
+static void __exit exit_em_text(void)
{
tcf_em_unregister(&em_text_ops);
}
{
tcf_em_unregister(&em_text_ops);
}