diff --git a/drivers/staging/brcm80211/brcmsmac/Makefile b/drivers/staging/brcm80211/brcmsmac/Makefile
index 3d9e04bb4298241eee00a9eaf2692c09613a46ac..8dc234d0a23e6600af24902e3107660d83bd6b23 100644
--- a/drivers/staging/brcm80211/brcmsmac/Makefile
+++ b/drivers/staging/brcm80211/brcmsmac/Makefile
@@ -41,12 +41,12 @@ BRCMSMAC_OFILES := \
 	wlc_pmu.o \
 	wlc_rate.o \
 	wlc_stf.o \
+	aiutils.o \
 	phy/wlc_phy_cmn.o \
 	phy/wlc_phy_lcn.o \
 	phy/wlc_phy_n.o \
 	phy/wlc_phytbl_lcn.o \
 	phy/wlc_phytbl_n.o \
-	../util/aiutils.o \
 	../util/bcmutils.o \
 	../util/bcmwifi.o \
 	../util/bcmotp.o \
diff --git a/drivers/staging/brcm80211/util/aiutils.c b/drivers/staging/brcm80211/brcmsmac/aiutils.c
similarity index 100%
rename from drivers/staging/brcm80211/util/aiutils.c
rename to drivers/staging/brcm80211/brcmsmac/aiutils.c
diff --git a/drivers/staging/brcm80211/include/aiutils.h b/drivers/staging/brcm80211/brcmsmac/aiutils.h
similarity index 100%
rename from drivers/staging/brcm80211/include/aiutils.h
rename to drivers/staging/brcm80211/brcmsmac/aiutils.h