leds/acpi: Fix merge fallout from acpi_driver_data change

[linux-2.6-omap-h63xx.git] / net / netfilter / nf_internals.h

diff --git a/net/netfilter/nf_internals.h b/net/netfilter/nf_internals.h
index 0df7fff196a715f19c3f2621f4ecac8f0874e9a4..bf6609978af7ae3a1f961fe170684909b7453d2b 100644 (file)
--- a/net/netfilter/nf_internals.h
+++ b/net/netfilter/nf_internals.h
@@ -14,8 +14,8 @@
 
 /* core.c */
 extern unsigned int nf_iterate(struct list_head *head,
-                               struct sk_buff **skb,
-                               int hook,
+                               struct sk_buff *skb,
+                               unsigned int hook,
                                const struct net_device *indev,
                                const struct net_device *outdev,
                                struct list_head **i,
@@ -25,7 +25,7 @@ extern unsigned int nf_iterate(struct list_head *head,
 /* nf_queue.c */
 extern int nf_queue(struct sk_buff *skb,
                    struct list_head *elem,
-                   int pf, unsigned int hook,
+                   u_int8_t pf, unsigned int hook,
                    struct net_device *indev,
                    struct net_device *outdev,
                    int (*okfn)(struct sk_buff *),