Commit 4b168116 authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: remove usage of pcicfg.h from brcmsmac driver 



All PCI related definitions needed by the brcmsmac driver are going to
be consolidated in single header file nicpci.h. This commit removes
need to include pcicfg.h in brcmsmac driver sources.

Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e40514c2

drivers/staging/brcm80211/brcmsmac/aiutils.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <aiutils.h>

#include <bcmsoc.h>

#include <sbchipc.h>

#include <pcicfg.h>

#include <bcmdevs.h>



/* ********** from siutils.c *********** */

drivers/staging/brcm80211/brcmsmac/bcmsrom.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <bcmsoc.h>

#include <sbchipc.h>

#include <bcmdevs.h>

#include <pcicfg.h>

#include <nicpci.h>

#include <aiutils.h>

#include <bcmsrom.h>

drivers/staging/brcm80211/brcmsmac/nicpci.c

+1 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <pci_core.h>

#include <pcie_core.h>

#include <nicpci.h>

#include <pcicfg.h>



/* chipcontrol */

#define CHIPCTRL_4321_PLL_DOWN	0x800000	/* serdes PLL down override */
@@ -83,7 +82,7 @@ static bool pcicore_pmecap(pcicore_info_t *pi); 
/* Initialize the PCI core. It's caller's responsibility to make sure that this is done

 * only once

 */

void *pcicore_init(si_t *sih, void *pdev, void *regs)

void *pcicore_init(struct si_pub *sih, void *pdev, void *regs)

{

	pcicore_info_t *pi;

drivers/staging/brcm80211/brcmsmac/wl_mac80211.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include <bcmwifi.h>

#include <bcmutils.h>

#include <bcmnvram.h>

#include <pcicfg.h>

#include <nicpci.h>

#include <sbdma.h>



#include "phy/wlc_phy_int.h"

drivers/staging/brcm80211/brcmsmac/wlc_bmac.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <bcmutils.h>

#include <bcmnvram.h>

#include <sbchipc.h>

#include <pcicfg.h>

#include <nicpci.h>

#include <sbdma.h>

#include <bcmdma.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE