staging: brcm80211: merged bmac.c into main.c
authorRoland Vossen <rvossen@broadcom.com>
Mon, 8 Aug 2011 13:57:47 +0000 (15:57 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 23 Aug 2011 19:59:50 +0000 (12:59 -0700)
commit8702fee6460cac456f28117bda19559c57913671
tree855abcb53f50325d9f869a3981679615ce7a5485
parent2c1599cfd6a736e09c29c772fbaf41250646ad42
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>
drivers/staging/brcm80211/brcmsmac/Makefile
drivers/staging/brcm80211/brcmsmac/antsel.c
drivers/staging/brcm80211/brcmsmac/bmac.c [deleted file]
drivers/staging/brcm80211/brcmsmac/bmac.h [deleted file]
drivers/staging/brcm80211/brcmsmac/channel.c
drivers/staging/brcm80211/brcmsmac/main.c
drivers/staging/brcm80211/brcmsmac/main.h
drivers/staging/brcm80211/brcmsmac/phy_shim.c
drivers/staging/brcm80211/brcmsmac/stf.c