diff --git a/[refs] b/[refs]
index 0de91863473c..4cd533f9ccae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81c58732277654a51bb52832e1bc74234bb977bc
+refs/heads/master: 832f8f0378ff1566f2a222352c7ad5df3f8d0d9d
diff --git a/trunk/drivers/net/sungem.h b/trunk/drivers/net/sungem.h
index ff8ae5f79970..16edbb1a4a7a 100644
--- a/trunk/drivers/net/sungem.h
+++ b/trunk/drivers/net/sungem.h
@@ -1035,7 +1035,8 @@ struct gem {
 			
 #define ALIGNED_RX_SKB_ADDR(addr) \
         ((((unsigned long)(addr) + (64UL - 1UL)) & ~(64UL - 1UL)) - (unsigned long)(addr))
-static __inline__ struct sk_buff *gem_alloc_skb(int size, int gfp_flags)
+static __inline__ struct sk_buff *gem_alloc_skb(int size,
+						unsigned int __nocast gfp_flags)
 {
 	struct sk_buff *skb = alloc_skb(size + 64, gfp_flags);