From: Roland Vossen Date: Wed, 1 Jun 2011 11:46:07 +0000 (+0200) Subject: staging: brcm80211: renamed file X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=225fa52c2397605892477a53f388aa49ef7d8c5a;p=mv-sheeva.git staging: brcm80211: renamed file Signed-off-by: Roland Vossen Reviewed-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 ee5c3f034a6..1ea3e0c48f3 100644 --- a/drivers/staging/brcm80211/brcmsmac/Makefile +++ b/drivers/staging/brcm80211/brcmsmac/Makefile @@ -33,7 +33,7 @@ BRCMSMAC_OFILES := \ alloc.o \ ampdu.o \ antsel.o \ - bottom_mac.o \ + bmac.o \ channel.o \ main.o \ phy_shim.o \ diff --git a/drivers/staging/brcm80211/brcmsmac/antsel.c b/drivers/staging/brcm80211/brcmsmac/antsel.c index fdac2113cb7..f967c592cae 100644 --- a/drivers/staging/brcm80211/brcmsmac/antsel.c +++ b/drivers/staging/brcm80211/brcmsmac/antsel.c @@ -29,7 +29,7 @@ #include "scb.h" #include "pub.h" #include "phy/phy_hal.h" -#include "bottom_mac.h" +#include "bmac.h" #include "channel.h" #include "main.h" #include "antsel.h" diff --git a/drivers/staging/brcm80211/brcmsmac/bottom_mac.c b/drivers/staging/brcm80211/brcmsmac/bmac.c similarity index 99% rename from drivers/staging/brcm80211/brcmsmac/bottom_mac.c rename to drivers/staging/brcm80211/brcmsmac/bmac.c index 8a99bb1d82a..417cf544de3 100644 --- a/drivers/staging/brcm80211/brcmsmac/bottom_mac.c +++ b/drivers/staging/brcm80211/brcmsmac/bmac.c @@ -44,7 +44,7 @@ #include "ucode_loader.h" #include "antsel.h" #include "alloc.h" -#include "bottom_mac.h" +#include "bmac.h" #include "mac80211_if.h" #define TIMER_INTERVAL_WATCHDOG_BMAC 1000 /* watchdog timer, in unit of ms */ diff --git a/drivers/staging/brcm80211/brcmsmac/bottom_mac.h b/drivers/staging/brcm80211/brcmsmac/bmac.h similarity index 100% rename from drivers/staging/brcm80211/brcmsmac/bottom_mac.h rename to drivers/staging/brcm80211/brcmsmac/bmac.h diff --git a/drivers/staging/brcm80211/brcmsmac/channel.c b/drivers/staging/brcm80211/brcmsmac/channel.c index b17232053c4..9583140b0ff 100644 --- a/drivers/staging/brcm80211/brcmsmac/channel.c +++ b/drivers/staging/brcm80211/brcmsmac/channel.c @@ -29,7 +29,7 @@ #include "scb.h" #include "pub.h" #include "phy/phy_hal.h" -#include "bottom_mac.h" +#include "bmac.h" #include "rate.h" #include "channel.h" #include "main.h" diff --git a/drivers/staging/brcm80211/brcmsmac/main.c b/drivers/staging/brcm80211/brcmsmac/main.c index cfd04ca81ab..3613900cf29 100644 --- a/drivers/staging/brcm80211/brcmsmac/main.c +++ b/drivers/staging/brcm80211/brcmsmac/main.c @@ -36,7 +36,7 @@ #include "phy/phy_hal.h" #include "channel.h" #include "main.h" -#include "bottom_mac.h" +#include "bmac.h" #include "phy_hal.h" #include "antsel.h" #include "stf.h" diff --git a/drivers/staging/brcm80211/brcmsmac/phy_shim.c b/drivers/staging/brcm80211/brcmsmac/phy_shim.c index 925edeb0183..d4975736f0d 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy_shim.c +++ b/drivers/staging/brcm80211/brcmsmac/phy_shim.c @@ -40,7 +40,7 @@ #include "phy/phy_hal.h" #include "channel.h" #include "srom.h" -#include "bottom_mac.h" +#include "bmac.h" #include "phy_hal.h" #include "main.h" #include "phy_shim.h" diff --git a/drivers/staging/brcm80211/brcmsmac/stf.c b/drivers/staging/brcm80211/brcmsmac/stf.c index 561aba84feb..5f98804ec7b 100644 --- a/drivers/staging/brcm80211/brcmsmac/stf.c +++ b/drivers/staging/brcm80211/brcmsmac/stf.c @@ -31,7 +31,7 @@ #include "phy/phy_hal.h" #include "channel.h" #include "main.h" -#include "bottom_mac.h" +#include "bmac.h" #include "stf.h" #define MIN_SPATIAL_EXPANSION 0