diff options
author | John W. Linville <linville@tuxdriver.com> | 2007-02-17 23:26:09 (GMT) |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2007-02-17 23:26:09 (GMT) |
commit | b312362be6d9155b66f3a26d9159e0a680fbd6c5 (patch) | |
tree | 52ebaad6117abf806dab4e738d01b509839f7b12 /drivers/net/wireless/wavelan.p.h | |
parent | bdcac1878c80b068d8e073c1691d4bd09ba9996d (diff) | |
parent | bb52a653eaef4aee877b2fa36de8699926f788bd (diff) | |
download | linux-fsl-qoriq-b312362be6d9155b66f3a26d9159e0a680fbd6c5.tar.xz |
Merge branch 'upstream' into upstream-jgarzik
Conflicts:
net/ieee80211/softmac/ieee80211softmac_module.c
net/ieee80211/softmac/ieee80211softmac_wx.c
Diffstat (limited to 'drivers/net/wireless/wavelan.p.h')
-rw-r--r-- | drivers/net/wireless/wavelan.p.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/wireless/wavelan.p.h b/drivers/net/wireless/wavelan.p.h index 72b646c..fe24281 100644 --- a/drivers/net/wireless/wavelan.p.h +++ b/drivers/net/wireless/wavelan.p.h @@ -449,9 +449,6 @@ static const char *version = "wavelan.c : v24 (SMP + wireless extensions) 11/12/ /* Watchdog temporisation */ #define WATCHDOG_JIFFIES (512*HZ/100) -/* Macro to get the number of elements in an array */ -#define NELS(a) (sizeof(a) / sizeof(a[0])) - /* ------------------------ PRIVATE IOCTL ------------------------ */ #define SIOCSIPQTHR SIOCIWFIRSTPRIV /* Set quality threshold */ |