Commit a1c16ed2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: brcm80211: remove typedefs.h 



It's not needed anymore, so remove it and clean up the .h inclusion mess
a bit to get everything to build properly again.

Wow, this needs some unwinding...

Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f024c48a

drivers/staging/brcm80211/brcmfmac/bcmsdh.c

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ 
 */

/* ****************** BCMSDH Interface Functions *************************** */



#include <typedefs.h>

#include <linux/types.h>

#include <bcmdefs.h>

#include <bcmdevs.h>

#include <bcmendian.h>

#include <bcmutils.h>

drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 


#define __UNDEF_NO_VERSION__



#include <typedefs.h>

#include <linuxver.h>



#include <linux/pci.h>

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 
 * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */

#include <typedefs.h>



#include <linux/types.h>

#include <bcmdefs.h>

#include <bcmdevs.h>

#include <bcmendian.h>

#include <bcmutils.h>

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c

+3 −4
Original line number Diff line number Diff line
@@ -13,15 +13,14 @@ 
 * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



#include <typedefs.h>

#include <linux/types.h>

#include <linux/sched.h>	/* request_irq() */

#include <bcmdefs.h>

#include <bcmutils.h>

#include <sdio.h>		/* SDIO Specs */

#include <bcmsdbus.h>		/* bcmsdh to/from specific controller APIs */

#include <sdiovar.h>		/* to get msglevel bit values */



#include <linux/sched.h>	/* request_irq() */



#include <linux/mmc/core.h>

#include <linux/mmc/card.h>

#include <linux/mmc/sdio_func.h>

drivers/staging/brcm80211/brcmfmac/dhd_cdc.c

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



#include <typedefs.h>

#include <linux/types.h>

#include <bcmdefs.h>

#include <osl.h>



#include <bcmutils.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE