From 4581d75ccf690e4a89973f7ebe66cbd515f74cc7 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Mon, 3 Oct 2005 21:24:36 -0700
Subject: [PATCH] --- yaml --- r: 9623 b: refs/heads/master c:
 81c58732277654a51bb52832e1bc74234bb977bc h: refs/heads/master i:   9621:
 dea7cd2744b4a0fb8b2dfb0a7f7dcff9cb0c407c   9619:
 7f2c3c40a447619b5dc7c14d16fd9f1daee9287d   9615:
 73804ecca01da3e76e64bf41aa8b83f5a5e3172c v: v3

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

diff --git a/[refs] b/[refs]
index 13a1964c6a68..0de91863473c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f36a29d5672c7698ffe55c7c05107ae77fa698cc
+refs/heads/master: 81c58732277654a51bb52832e1bc74234bb977bc
diff --git a/trunk/drivers/net/ns83820.c b/trunk/drivers/net/ns83820.c
index 1d123d2b53fd..83334db2921c 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, unsigned int gfp)
+static inline int rx_refill(struct net_device *ndev, unsigned int __nocast gfp)
 {
 	struct ns83820 *dev = PRIV(ndev);
 	unsigned i;