X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=net%2Fllc%2Fllc_conn.c;h=c761c15da4212e987be4db497d650df8758bf5b6;hb=f2aca47dc3c2d0c2d5dbd972558557e74232bbce;hp=042b24a8ca4c2119904c34c90ce6020951c9525a;hpb=bb77c03cf40fec911c4ce9610b8207bf0050a5fd;p=linux-2.6-omap-h63xx.git

diff --git a/net/llc/llc_conn.c b/net/llc/llc_conn.c
index 042b24a8ca4..c761c15da42 100644
--- a/net/llc/llc_conn.c
+++ b/net/llc/llc_conn.c
@@ -867,8 +867,7 @@ static void llc_sk_init(struct sock* sk)
  *	Allocates a LLC sock and initializes it. Returns the new LLC sock
  *	or %NULL if there's no memory available for one
  */
-struct sock *llc_sk_alloc(int family, unsigned int __nocast priority,
-			 struct proto *prot)
+struct sock *llc_sk_alloc(int family, gfp_t priority, struct proto *prot)
 {
 	struct sock *sk = sk_alloc(family, priority, prot, 1);