diff --git a/[refs] b/[refs]
index b9d40c803987..2522fd052828 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32b45065766b7421db2264a3ab7564c046a46d4d
+refs/heads/master: 383aab51ddddcb05600a9fed9913325243d478f8
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/aiutils.c b/trunk/drivers/staging/brcm80211/brcmsmac/aiutils.c
index 7eabe909e4af..fee89669c392 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/aiutils.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/aiutils.c
@@ -29,7 +29,7 @@
 
 /* ********** from siutils.c *********** */
 #include <nicpci.h>
-#include <srom.h>
+#include "srom.h"
 #include <pmu.h>
 #include <scb.h>
 #include <pub.h>
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/bottom_mac.c b/trunk/drivers/staging/brcm80211/brcmsmac/bottom_mac.c
index 365cae065374..719df415578c 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/bottom_mac.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/bottom_mac.c
@@ -25,7 +25,7 @@
 #include <brcm_hw_ids.h>
 #include <brcmu_wifi.h>
 #include <aiutils.h>
-#include <srom.h>
+#include "srom.h"
 #include "otp.h"
 #include <brcmu_utils.h>
 #include <chipcommon.h>
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/main.c b/trunk/drivers/staging/brcm80211/brcmsmac/main.c
index 759e68fa0a25..fc3d71d3b783 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/main.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/main.c
@@ -24,7 +24,7 @@
 #include <brcmu_utils.h>
 #include <brcmu_wifi.h>
 #include <aiutils.h>
-#include <srom.h>
+#include "srom.h"
 #include "dma.h"
 
 #include "pmu.h"
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/phy_shim.c b/trunk/drivers/staging/brcm80211/brcmsmac/phy_shim.c
index 330001504c02..8b891f4ef632 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/phy_shim.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/phy_shim.c
@@ -40,7 +40,7 @@
 #include "pub.h"
 #include "phy/phy_hal.h"
 #include "channel.h"
-#include <srom.h>
+#include "srom.h"
 #include "key.h"
 #include "bottom_mac.h"
 #include "phy_hal.h"
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/srom.c b/trunk/drivers/staging/brcm80211/brcmsmac/srom.c
index 5a7b4348c77a..17e0f2aa4051 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/srom.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/srom.c
@@ -27,7 +27,7 @@
 #include <brcm_hw_ids.h>
 #include <nicpci.h>
 #include <aiutils.h>
-#include <srom.h>
+#include "srom.h"
 #include "otp.h"
 
 #define SROM_OFFSET(sih) ((sih->ccrev > 31) ? \
diff --git a/trunk/drivers/staging/brcm80211/include/srom.h b/trunk/drivers/staging/brcm80211/brcmsmac/srom.h
similarity index 100%
rename from trunk/drivers/staging/brcm80211/include/srom.h
rename to trunk/drivers/staging/brcm80211/brcmsmac/srom.h