diff --git a/[refs] b/[refs]
index 5af2c7368fe8..7f4e7435f9d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a918fb3cc6a58f918f36348c43c3170bb88bc599
+refs/heads/master: 0737237411235d7c48a993a62de01257cc4b004d
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/sdio.c b/trunk/drivers/net/wireless/ath/ath6kl/sdio.c
index 0586b3b3ab54..beb5f9bf26af 100644
--- a/trunk/drivers/net/wireless/ath/ath6kl/sdio.c
+++ b/trunk/drivers/net/wireless/ath/ath6kl/sdio.c
@@ -831,8 +831,6 @@ static int ath6kl_sdio_resume(struct ath6kl *ar)
 		break;
 
 	case ATH6KL_STATE_ON:
-		/* we shouldn't be on this state during resume */
-		WARN_ON(1);
 		break;
 
 	case ATH6KL_STATE_DEEPSLEEP: