Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 259362
b: refs/heads/master
c: 189aed0
h: refs/heads/master
v: v3
  • Loading branch information
Roland Vossen authored and Greg Kroah-Hartman committed Jun 7, 2011
1 parent d358551 commit a2941f5
Show file tree
Hide file tree
Showing 30 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5d6e3aec346a0ce5e028609aa6acfdd1f2828bcf
refs/heads/master: 189aed097b1dc458d2290034fb3136147e64a1de
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <bcmdefs.h>
#include <bcmdevs.h>
#include <bcmutils.h>
#include <hndsoc.h>
#include <bcmsoc.h>

#include <bcmsdh.h> /* BRCM API for SDIO
clients (such as wl, dhd) */
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
#include <bcmutils.h>
#include <bcmdevs.h>

#include <hndsoc.h>
#include <bcmsoc.h>
#ifdef DHD_DEBUG
#include <hndrte_armtrap.h>
#include <hndrte_cons.h>
#include <rte_armtrap.h>
#include <rte_cons.h>
#endif /* DHD_DEBUG */
#include <sbchipc.h>
#include <sbhnddma.h>
#include <sbdma.h>

#include <sdio.h>
#include <sbsdio.h>
Expand Down
0 ...aging/brcm80211/brcmfmac/hndrte_armtrap.h → .../staging/brcm80211/brcmfmac/rte_armtrap.h
View file
File renamed without changes.
0 .../staging/brcm80211/brcmfmac/hndrte_cons.h → ...ers/staging/brcm80211/brcmfmac/rte_cons.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/brcmsmac/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ BRCMSMAC_OFILES := \
phy/wlc_phy_qmath.o \
bcmotp.o \
bcmsrom.o \
hnddma.o \
dma.o \
nicpci.o \
nvram.o

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/brcmsmac/aiutils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <linux/pci.h>
#include <bcmutils.h>
#include <aiutils.h>
#include <hndsoc.h>
#include <bcmsoc.h>
#include <sbchipc.h>
#include <pcicfg.h>
#include <bcmdevs.h>
Expand Down
0 ...rivers/staging/brcm80211/include/hnddma.h → ...ivers/staging/brcm80211/brcmsmac/bcmdma.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/brcmsmac/bcmotp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <bcmdevs.h>
#include <bcmutils.h>
#include <aiutils.h>
#include <hndsoc.h>
#include <bcmsoc.h>
#include <sbchipc.h>
#include <bcmotp.h>

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/brcmsmac/bcmsrom.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <linux/pci.h>
#include <stdarg.h>
#include <bcmutils.h>
#include <hndsoc.h>
#include <bcmsoc.h>
#include <sbchipc.h>
#include <bcmdevs.h>
#include <pcicfg.h>
Expand Down
6 changes: 3 additions & 3 deletions ...ivers/staging/brcm80211/brcmsmac/hnddma.c → .../drivers/staging/brcm80211/brcmsmac/dma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
#include <linux/pci.h>
#include <bcmdefs.h>
#include <bcmdevs.h>
#include <hndsoc.h>
#include <bcmsoc.h>
#include <bcmutils.h>
#include <aiutils.h>

#include <sbhnddma.h>
#include <hnddma.h>
#include <sbdma.h>
#include <bcmdma.h>

#if defined(__mips__)
#include <asm/addrspace.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/brcmsmac/nicpci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <bcmutils.h>
#include <bcmnvram.h>
#include <aiutils.h>
#include <hndsoc.h>
#include <bcmsoc.h>
#include <bcmdevs.h>
#include <sbchipc.h>
#include <pci_core.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/brcmsmac/nvram.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <bcmnvram.h>
#include <sbchipc.h>
#include <bcmdevs.h>
#include <hndsoc.h>
#include <bcmsoc.h>

#define NVR_MSG(x)

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <bcmnvram.h>
#include <sbchipc.h>
#include <bcmdevs.h>
#include <sbhnddma.h>
#include <sbdma.h>

#include <wlc_phy_int.h>
#include <wlc_phyreg_n.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <bcmnvram.h>

#include <bcmdevs.h>
#include <sbhnddma.h>
#include <sbdma.h>

#include "wlc_phy_radio.h"
#include "wlc_phy_int.h"
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <wlc_pmu.h>

#include <bcmdevs.h>
#include <sbhnddma.h>
#include <sbdma.h>

#include <wlc_phy_radio.h>
#include <wlc_phy_int.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#include <linux/types.h>
#include <sbhnddma.h>
#include <sbdma.h>
#include <wlc_phy_int.h>
#include <wlc_phytbl_lcn.h>

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include <linux/kernel.h>

#include <sbhnddma.h>
#include <sbdma.h>
#include <wlc_phy_int.h>
#include <wlc_phytbl_n.h>

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include <bcmutils.h>
#include <bcmnvram.h>
#include <pcicfg.h>
#include <sbhnddma.h>
#include <sbdma.h>

#include "phy/wlc_phy_int.h"
#include "d11.h"
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <bcmdefs.h>
#include <bcmutils.h>
#include <aiutils.h>
#include <sbhnddma.h>
#include <sbdma.h>

#include "d11.h"
#include "wlc_types.h"
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#include <bcmdefs.h>
#include <bcmutils.h>
#include <aiutils.h>
#include <sbhnddma.h>
#include <hnddma.h>
#include <sbdma.h>
#include <bcmdma.h>
#include <d11.h>

#include "wlc_types.h"
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <bcmnvram.h>
#include <aiutils.h>
#include <bcmdevs.h>
#include <sbhnddma.h>
#include <sbdma.h>

#include "d11.h"
#include "wlc_rate.h"
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
#include <sbconfig.h>
#include <sbchipc.h>
#include <pcicfg.h>
#include <sbhnddma.h>
#include <hnddma.h>
#include <sbdma.h>
#include <bcmdma.h>

#include "wlc_types.h"
#include "wlc_pmu.h"
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/brcmsmac/wlc_channel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <bcmutils.h>
#include <bcmnvram.h>
#include <aiutils.h>
#include <sbhnddma.h>
#include <sbdma.h>

#include "wlc_types.h"
#include "d11.h"
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
#include <aiutils.h>
#include <pcicfg.h>
#include <bcmsrom.h>
#include <sbhnddma.h>
#include <hnddma.h>
#include <sbdma.h>
#include <bcmdma.h>

#include "wlc_pmu.h"
#include "d11.h"
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
#include <sbconfig.h>
#include <sbchipc.h>
#include <pcicfg.h>
#include <sbhnddma.h>
#include <hnddma.h>
#include <sbdma.h>
#include <bcmdma.h>
#include <wlc_pmu.h>

#include "wlc_types.h"
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/brcmsmac/wlc_rate.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <bcmdefs.h>
#include <bcmutils.h>
#include <aiutils.h>
#include <sbhnddma.h>
#include <sbdma.h>

#include "wlc_types.h"
#include "d11.h"
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/brcmsmac/wlc_stf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <aiutils.h>
#include <bcmwifi.h>
#include <bcmnvram.h>
#include <sbhnddma.h>
#include <sbdma.h>

#include "wlc_types.h"
#include "d11.h"
Expand Down
0 ...rivers/staging/brcm80211/include/hndsoc.h → ...rivers/staging/brcm80211/include/bcmsoc.h
View file
File renamed without changes.
0 ...vers/staging/brcm80211/include/sbhnddma.h → ...drivers/staging/brcm80211/include/sbdma.h
View file
File renamed without changes.

0 comments on commit a2941f5

Please sign in to comment.