diff --git a/[refs] b/[refs] index 17cf0cd5620f..d872e942cae4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7716314bf9b9767eb1a69a16c68d05f17bc34588 +refs/heads/master: 22b564b0b6909664bd7adac2fa9f3f0abc46457a diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index 363a6b7f31bc..dcb332913fa6 100644 --- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c @@ -333,8 +333,6 @@ uint dhd_radio_up = 1; char iface_name[IFNAMSIZ]; module_param_string(iface_name, iface_name, IFNAMSIZ, 0); -#define BLOCKABLE() (!in_atomic()) - /* The following are specific to the SDIO dongle */ /* IOCTL response timeout */