diff --git a/[refs] b/[refs] index 7875aa838ddf..5c918c23211a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8abf1064c786ef5435b2d53cc8e9ebee13020de6 +refs/heads/master: 1db2ea398ffbfd9ea46d509ff0e4a85bb4b8c0ea diff --git a/trunk/include/net/netlabel.h b/trunk/include/net/netlabel.h index fc2b72fc7e07..dd5780b36919 100644 --- a/trunk/include/net/netlabel.h +++ b/trunk/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;