Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / net / sched / em_cmp.c

diff --git a/net/sched/em_cmp.c b/net/sched/em_cmp.c
index 8ed93c39b4eaa5dcd76e2ebdeee3690dad3bb5eb..8d6dacd8190054a9cc401d48342232644ad3e7a9 100644 (file)
--- a/net/sched/em_cmp.c
+++ b/net/sched/em_cmp.c
@@ -88,7 +88,7 @@ static int __init init_em_cmp(void)
        return tcf_em_register(&em_cmp_ops);
 }
 
-static void __exit exit_em_cmp(void) 
+static void __exit exit_em_cmp(void)
 {
        tcf_em_unregister(&em_cmp_ops);
 }