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

[pandora-kernel.git] / include / net / netlabel.h

diff --git a/include/net/netlabel.h b/include/net/netlabel.h
index fc2b72f..dd5780b 100644 (file)
--- a/include/net/netlabel.h
+++ b/include/net/netlabel.h
@@ -108,7 +108,7 @@
  */
 static inline struct sk_buff *netlbl_netlink_alloc_skb(size_t head,
                                                       size_t body,
-                                                      int gfp_flags)
+                                                      gfp_t gfp_flags)
 {
        struct sk_buff *skb;