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;