diff --git a/[refs] b/[refs] index e7bb9ca387d7..c59829491618 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d3d6a6945df5c78c7f7882dabdb5638b05b2f5c +refs/heads/master: d2733c97faf94ae22f214f3cfb288da3366e6ad5 diff --git a/trunk/drivers/staging/brcm80211/include/bcmutils.h b/trunk/drivers/staging/brcm80211/include/bcmutils.h index 40b579f3e1ab..58858d088f7e 100644 --- a/trunk/drivers/staging/brcm80211/include/bcmutils.h +++ b/trunk/drivers/staging/brcm80211/include/bcmutils.h @@ -452,8 +452,6 @@ extern "C" { #define CEIL(x, y) (((x) + ((y)-1)) / (y)) #define ROUNDUP(x, y) ((((x)+((y)-1))/(y))*(y)) #define ISALIGNED(a, x) (((a) & ((x)-1)) == 0) -#define ALIGN_ADDR(addr, boundary) (void *)(((uintptr)(addr) + (boundary) - 1) \ - & ~((boundary) - 1)) #define ISPOWEROF2(x) ((((x)-1)&(x)) == 0) #define VALID_MASK(mask) (!((mask) & ((mask) + 1)))