Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / include / net / llc_conn.h

diff --git a/include/net/llc_conn.h b/include/net/llc_conn.h
index 54852ff6033bdf0c57cea25c0dc91ff3df468ed0..e2374e34989f07d9c39d7bdf30c44266bc1f5ad0 100644 (file)
--- a/include/net/llc_conn.h
+++ b/include/net/llc_conn.h
@@ -93,7 +93,7 @@ static __inline__ char llc_backlog_type(struct sk_buff *skb)
        return skb->cb[sizeof(skb->cb) - 1];
 }
 
-extern struct sock *llc_sk_alloc(int family, unsigned int __nocast priority,
+extern struct sock *llc_sk_alloc(struct net *net, int family, gfp_t priority,
                                 struct proto *prot);
 extern void llc_sk_free(struct sock *sk);