From 6c3fdd4e2f6146b4df3397363e1838b9317478ca Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Sun, 2 Oct 2005 22:42:11 -0700
Subject: [PATCH] --- yaml --- r: 9613 b: refs/heads/master c:
 0a1c80f1115b9a1aacf00a312a532ceef49dfa1b h: refs/heads/master i:   9611:
 bb3220546c90f0c715f63b2bdb7c056cb4472540 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/ns83820.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;