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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  [PKT_SCHED] ematch: Fix build warning.

1 files changed, 1 insertions, 1 deletions

diff --git a/net/sched/ematch.c b/net/sched/ematch.c
index b29439ddcf71..5e6f82e0e6f3 100644
--- a/net/sched/ematch.c
+++ b/net/sched/ematch.c
@@ -410,7 +410,7 @@ void tcf_em_tree_destroy(struct tcf_proto *tp, struct tcf_ematch_tree *tree)
                         if (em->ops->destroy)
                                 em->ops->destroy(tp, em);
                         else if (!tcf_em_is_simple(em))
-                                kfree(em->data);
+                                kfree((void *) em->data);
                         module_put(em->ops->owner);
                 }
         }