From 8ca67820003ba911fc8e882a3e0a03a23be8be8d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 5 Oct 2010 11:28:57 -0700 Subject: [PATCH] --- yaml --- r: 220075 b: refs/heads/master c: 5b5a285c7bab3851aa428a2ead14106a3f949788 h: refs/heads/master i: 220073: e933b33cfc59a42c7e2067ee15642b85afa9c746 220071: 8c9754a16b46a891aa781a66f4168df327b21f71 v: v3 --- [refs] | 2 +- .../staging/brcm80211/include/bcmdefs.h | 21 ------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/[refs] b/[refs] index b24b9daadaf6..1bd68c37b876 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 648a79b994b41a1056886976735ff4b9bbb6ea2c +refs/heads/master: 5b5a285c7bab3851aa428a2ead14106a3f949788 diff --git a/trunk/drivers/staging/brcm80211/include/bcmdefs.h b/trunk/drivers/staging/brcm80211/include/bcmdefs.h index 201510a9a4b6..67b369046840 100644 --- a/trunk/drivers/staging/brcm80211/include/bcmdefs.h +++ b/trunk/drivers/staging/brcm80211/include/bcmdefs.h @@ -29,10 +29,6 @@ * typedefs.h is included. */ -/* Use BCM_REFERENCE to suppress warnings about intentionally-unused function - * arguments or local variables. - */ -#define BCM_REFERENCE(data) ((void)data) /* Reclaiming text and data : * The following macros specify special linker sections that can be reclaimed @@ -44,18 +40,10 @@ #define bcmreclaimed 0 #define BCMATTACHDATA(_data) _data #define BCMATTACHFN(_fn) _fn -#define BCMPREATTACHDATA(_data) _data -#define BCMPREATTACHFN(_fn) _fn #define BCMINITDATA(_data) _data #define BCMINITFN(_fn) _fn #define BCMUNINITFN(_fn) _fn #define BCMNMIATTACHFN(_fn) _fn -#define BCMNMIATTACHDATA(_data) _data -#define BCMOVERLAY0DATA(_sym) _sym -#define BCMOVERLAY0FN(_fn) _fn -#define BCMOVERLAY1DATA(_sym) _sym -#define BCMOVERLAY1FN(_fn) _fn -#define BCMOVERLAYERRFN(_fn) _fn #ifdef mips #define BCMFASTPATH __attribute__ ((__section__(".text.fastpath"))) #else @@ -63,14 +51,7 @@ #endif /* Put some library data/code into ROM to reduce RAM requirements */ -#define BCMROMDATA(_data) _data -#define BCMROMDAT_NAME(_data) _data #define BCMROMFN(_fn) _fn -#define BCMROMFN_NAME(_fn) _fn -#define BCMROMDAT_ARYSIZ(data) ARRAYSIZE(data) -#define BCMROMDAT_SIZEOF(data) sizeof(data) -#define BCMROMDAT_APATCH(data) -#define BCMROMDAT_SPATCH(data) /* Bus types */ #define SI_BUS 0 /* SOC Interconnect */ @@ -224,6 +205,4 @@ typedef struct { /* Max. nvram variable table size */ #define MAXSZ_NVRAM_VARS 4096 -#define LOCATOR_EXTERN static - #endif /* _bcmdefs_h_ */