diff --git a/[refs] b/[refs]
index c92b733046db..17ed147d032c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5afa0a9cfb79556f45c02957e71a2ac48a5bb6a1
+refs/heads/master: 724bca3ca4d2126b67dd62e64d3f97805f9672de
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index 1d00cdcdaa67..a6c7bb9cea0d 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/drivers/net/sky2.c
@@ -28,10 +28,8 @@
  *	- coalescing setting?
  *
  * TOTEST
- *	- variable ring size
  *	- speed setting
- *	- power management
- *	- netpoll
+ *	- suspend/resume
  */
 
 #include <linux/config.h>
@@ -58,7 +56,7 @@
 #include "sky2.h"
 
 #define DRV_NAME		"sky2"
-#define DRV_VERSION		"0.5"
+#define DRV_VERSION		"0.6"
 #define PFX			DRV_NAME " "
 
 /*
@@ -1159,7 +1157,7 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
 	re->idx = sky2->tx_prod;
 	le->ctrl |= EOP;
 
-	sky2_put_idx(sky2->hw, txqaddr[sky2->port], sky2->tx_prod,
+	sky2_put_idx(hw, txqaddr[sky2->port], sky2->tx_prod,
 		     &sky2->tx_last_put, TX_RING_SIZE);
 
 	if (tx_avail(sky2) < MAX_SKB_TX_LE + 1)