diff --git a/[refs] b/[refs]
index 29b182e64ecf..d72b23b6da0b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2681dd8c71c8fb4ca530f94536550fcd843aae4
+refs/heads/master: 0a1c80f1115b9a1aacf00a312a532ceef49dfa1b
diff --git a/trunk/drivers/net/ns83820.c b/trunk/drivers/net/ns83820.c
index e64df4d0800b..1d123d2b53fd 100644
--- a/trunk/drivers/net/ns83820.c
+++ b/trunk/drivers/net/ns83820.c
@@ -584,7 +584,7 @@ static inline int ns83820_add_rx_skb(struct ns83820 *dev, struct sk_buff *skb)
 	return 0;
 }
 
-static inline int rx_refill(struct net_device *ndev, int gfp)
+static inline int rx_refill(struct net_device *ndev, unsigned int gfp)
 {
 	struct ns83820 *dev = PRIV(ndev);
 	unsigned i;