From: Brett Rudley <brudley@xxxxxxxxxxxx> Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx> --- drivers/staging/brcm80211/include/osl.h | 16 ++-------------- 1 files changed, 2 insertions(+), 14 deletions(-) diff --git a/drivers/staging/brcm80211/include/osl.h b/drivers/staging/brcm80211/include/osl.h index 662b519..c2fa297 100644 --- a/drivers/staging/brcm80211/include/osl.h +++ b/drivers/staging/brcm80211/include/osl.h @@ -38,22 +38,10 @@ typedef struct osl_dmainfo osldma_t; typedef unsigned int (*osl_rreg_fn_t) (void *ctx, void *reg, unsigned int size); typedef void (*osl_wreg_fn_t) (void *ctx, void *reg, unsigned int val, unsigned int size); -#endif +#endif /* BCMSDIO */ #include <linux_osl.h> -/* -------------------------------------------------------------------------- -** Register manipulation macros. -*/ - #define SET_REG(osh, r, mask, val) W_REG((osh), (r), ((R_REG((osh), r) & ~(mask)) | (val))) -#ifndef AND_REG -#define AND_REG(osh, r, v) W_REG(osh, (r), R_REG(osh, r) & (v)) -#endif /* !AND_REG */ - -#ifndef OR_REG -#define OR_REG(osh, r, v) W_REG(osh, (r), R_REG(osh, r) | (v)) -#endif /* !OR_REG */ - -#endif /* _osl_h_ */ +#endif /* _osl_h_ */ -- 1.7.3.2 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
