diff --git a/[refs] b/[refs]
index 7de99af4af14..c3e13c90fa73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ef2a435bea24330781cbfe910a05810f17079d2
+refs/heads/master: 966684d581c9c04202e6612a792e36ae7bc5fd59
diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/trunk/drivers/net/ethernet/mellanox/mlx4/en_tx.c
index 008f0af5cc8b..17968244c399 100644
--- a/trunk/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+++ b/trunk/drivers/net/ethernet/mellanox/mlx4/en_tx.c
@@ -584,7 +584,7 @@ u16 mlx4_en_select_queue(struct net_device *dev, struct sk_buff *skb)
 	return skb_tx_hash(dev, skb);
 }
 
-static void mlx4_bf_copy(unsigned long *dst, unsigned long *src, unsigned bytecnt)
+static void mlx4_bf_copy(void __iomem *dst, unsigned long *src, unsigned bytecnt)
 {
 	__iowrite64_copy(dst, src, bytecnt / 8);
 }