From: Henry Ptasinski Date: Mon, 9 May 2011 14:33:03 +0000 (+0200) Subject: staging: brcm80211: move files only used by brcmsmac into appropriate dir X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=47d30257706a90926de396bc3055684d9215abd9;p=linux-beck.git staging: brcm80211: move files only used by brcmsmac into appropriate dir A number of files in the util subdir are only used by the brcmsmac driver. Move those files into the brcmsmac subdir instead, and do the necessary Makefile updates to get the files from the new location. Cc: devel@linuxdriverproject.org Cc: linux-wireless@vger.kernel.org Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/brcm80211/brcmsmac/Makefile b/drivers/staging/brcm80211/brcmsmac/Makefile index 21797748100f..1cd3a1eada96 100644 --- a/drivers/staging/brcm80211/brcmsmac/Makefile +++ b/drivers/staging/brcm80211/brcmsmac/Makefile @@ -25,7 +25,6 @@ ccflags-y := \ -DBCMNVRAMR \ -Idrivers/staging/brcm80211/brcmsmac \ -Idrivers/staging/brcm80211/brcmsmac/phy \ - -Idrivers/staging/brcm80211/util \ -Idrivers/staging/brcm80211/include BRCMSMAC_OFILES := \ @@ -48,12 +47,12 @@ BRCMSMAC_OFILES := \ phy/wlc_phytbl_lcn.o \ phy/wlc_phytbl_n.o \ phy/wlc_phy_qmath.o \ + bcmotp.o \ + bcmsrom.o \ + hnddma.o \ + nicpci.o \ ../util/bcmutils.o \ ../util/bcmwifi.o \ - ../util/bcmotp.o \ - ../util/bcmsrom.o \ - ../util/hnddma.o \ - ../util/nicpci.o \ ../util/nvram/nvram_ro.o MODULEPFX := brcmsmac diff --git a/drivers/staging/brcm80211/util/bcmotp.c b/drivers/staging/brcm80211/brcmsmac/bcmotp.c similarity index 100% rename from drivers/staging/brcm80211/util/bcmotp.c rename to drivers/staging/brcm80211/brcmsmac/bcmotp.c diff --git a/drivers/staging/brcm80211/util/bcmsrom.c b/drivers/staging/brcm80211/brcmsmac/bcmsrom.c similarity index 100% rename from drivers/staging/brcm80211/util/bcmsrom.c rename to drivers/staging/brcm80211/brcmsmac/bcmsrom.c diff --git a/drivers/staging/brcm80211/util/bcmsrom_tbl.h b/drivers/staging/brcm80211/brcmsmac/bcmsrom_tbl.h similarity index 100% rename from drivers/staging/brcm80211/util/bcmsrom_tbl.h rename to drivers/staging/brcm80211/brcmsmac/bcmsrom_tbl.h diff --git a/drivers/staging/brcm80211/util/hnddma.c b/drivers/staging/brcm80211/brcmsmac/hnddma.c similarity index 100% rename from drivers/staging/brcm80211/util/hnddma.c rename to drivers/staging/brcm80211/brcmsmac/hnddma.c diff --git a/drivers/staging/brcm80211/util/nicpci.c b/drivers/staging/brcm80211/brcmsmac/nicpci.c similarity index 100% rename from drivers/staging/brcm80211/util/nicpci.c rename to drivers/staging/brcm80211/brcmsmac/nicpci.c