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/prism54/oid_mgt.c | |
| 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/prism54/oid_mgt.c')
| -rw-r--r-- | drivers/net/wireless/prism54/oid_mgt.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/prism54/oid_mgt.c b/drivers/net/wireless/prism54/oid_mgt.c index e6cf9df..4278032 100644 --- a/drivers/net/wireless/prism54/oid_mgt.c +++ b/drivers/net/wireless/prism54/oid_mgt.c @@ -16,6 +16,8 @@ * */ +#include <linux/kernel.h> + #include "prismcompat.h" #include "islpci_dev.h" #include "islpci_mgt.h" @@ -692,7 +694,7 @@ mgt_update_addr(islpci_private *priv) return ret; } -#define VEC_SIZE(a) (sizeof(a)/sizeof(a[0])) +#define VEC_SIZE(a) ARRAY_SIZE(a) int mgt_commit(islpci_private *priv) |