diff --git a/[refs] b/[refs]
index ac718872782a..1c95bd866b3a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5686ecd5aef71f2035f56540184f411584db06e6
+refs/heads/master: 2ac6ff20265b2503cb1b172ac6e4e362676aaead
diff --git a/trunk/drivers/staging/rt2860/common/cmm_info.c b/trunk/drivers/staging/rt2860/common/cmm_info.c
index 306c3a21f905..9f3263369edd 100644
--- a/trunk/drivers/staging/rt2860/common/cmm_info.c
+++ b/trunk/drivers/staging/rt2860/common/cmm_info.c
@@ -2725,9 +2725,6 @@ PCHAR   RTMPGetRalinkAuthModeStr(
 	{
 		case Ndis802_11AuthModeOpen:
 			return "OPEN";
-#if defined(RT2860) || defined(RT30xx)
-        default:
-#endif
 		case Ndis802_11AuthModeWPAPSK:
 			return "WPAPSK";
 		case Ndis802_11AuthModeShared:
@@ -2742,14 +2739,10 @@ PCHAR   RTMPGetRalinkAuthModeStr(
 			return "WPAPSKWPA2PSK";
         case Ndis802_11AuthModeWPA1WPA2:
 			return "WPA1WPA2";
-#ifndef RT30xx
 		case Ndis802_11AuthModeWPANone:
 			return "WPANONE";
-#ifdef RT2870
 		default:
 			return "UNKNOW";
-#endif
-#endif
 	}
 }