diff options
| author | Roland Vossen <rvossen@broadcom.com> | 2011-08-08 15:57:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-23 12:59:50 -0700 |
| commit | 8702fee6460cac456f28117bda19559c57913671 (patch) | |
| tree | 855abcb53f50325d9f869a3981679615ce7a5485 /drivers/staging/brcm80211/brcmsmac/phy_shim.c | |
| parent | 2c1599cfd6a736e09c29c772fbaf41250646ad42 (diff) | |
| download | op-kernel-dev-8702fee6460cac456f28117bda19559c57913671.zip op-kernel-dev-8702fee6460cac456f28117bda19559c57913671.tar.gz | |
staging: brcm80211: merged bmac.c into main.c
Future goal is to merge the bmac layer in the driver with the 'common' layer.
A step towards this goal is to have one file containing both bmac and common
code. Header files (bmac.h, main.h) were also merged.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/brcmsmac/phy_shim.c')
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy_shim.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/phy_shim.c b/drivers/staging/brcm80211/brcmsmac/phy_shim.c index 82ecdcd..56824f4 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy_shim.c +++ b/drivers/staging/brcm80211/brcmsmac/phy_shim.c @@ -23,7 +23,6 @@ #include <linux/slab.h> #include <net/mac80211.h> -#include "bmac.h" #include "main.h" #include "mac80211_if.h" #include "phy_shim.h" |
