diff --git a/[refs] b/[refs]
index 521b4a6e3fc9..b57966e0b2b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efc7d36f0d100eb2f2db33bc287fa17646bdcd7d
+refs/heads/master: 4e9e58c6bf6512a1812556188b67bada6a09c0e8
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2800lib.c b/trunk/drivers/net/wireless/rt2x00/rt2800lib.c
index f813b4388b63..d3cf0cc39500 100644
--- a/trunk/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/trunk/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -2769,7 +2769,6 @@ static int rt2800_ampdu_action(struct ieee80211_hw *hw,
 			       struct ieee80211_sta *sta,
 			       u16 tid, u16 *ssn)
 {
-	struct rt2x00_dev *rt2x00dev = hw->priv;
 	int ret = 0;
 
 	switch (action) {
@@ -2787,7 +2786,7 @@ static int rt2800_ampdu_action(struct ieee80211_hw *hw,
 	case IEEE80211_AMPDU_TX_OPERATIONAL:
 		break;
 	default:
-		WARNING(rt2x00dev, "Unknown AMPDU action\n");
+		WARNING((struct rt2x00_dev *)hw->priv, "Unknown AMPDU action\n");
 	}
 
 	return ret;