diff --git a/[refs] b/[refs]
index 4037bbb9dade..447a342eb93e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b1681163cbe5a07d322332b1ec238ffdf43a084
+refs/heads/master: 60204bef36d17504aeef37a8a209aa53562969e7
diff --git a/trunk/drivers/staging/brcm80211/include/pcicfg.h b/trunk/drivers/staging/brcm80211/brcmfmac/pcicfg.h
similarity index 100%
rename from trunk/drivers/staging/brcm80211/include/pcicfg.h
rename to trunk/drivers/staging/brcm80211/brcmfmac/pcicfg.h
diff --git a/trunk/drivers/staging/brcm80211/include/nicpci.h b/trunk/drivers/staging/brcm80211/brcmsmac/nicpci.h
similarity index 100%
rename from trunk/drivers/staging/brcm80211/include/nicpci.h
rename to trunk/drivers/staging/brcm80211/brcmsmac/nicpci.h