diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-27 22:03:52 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-27 22:03:52 -0400 |
| commit | 716b43303df605510399d6da0d0dd4e2ea376e7c (patch) | |
| tree | 57412aaf516b7a10b4b81064aeda318514fec168 /drivers/net/wireless/airo.c | |
| parent | 5696c1944a33b4434a9a1ebb6383b906afd43a10 (diff) | |
| parent | c7b645f934e52a54af58142d91fb51f881f8ce26 (diff) | |
Merge upstream ieee80211.h with us (us == branch 'ieee80211' of netdev-2.6)
Diffstat (limited to 'drivers/net/wireless/airo.c')
| -rw-r--r-- | drivers/net/wireless/airo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 180968899cad..c12648d8192b 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
| @@ -900,7 +900,7 @@ typedef struct aironet_ioctl { | |||
| 900 | unsigned char __user *data; // d-data | 900 | unsigned char __user *data; // d-data |
| 901 | } aironet_ioctl; | 901 | } aironet_ioctl; |
| 902 | 902 | ||
| 903 | static char *swversion = "2.1"; | 903 | static char swversion[] = "2.1"; |
| 904 | #endif /* CISCO_EXT */ | 904 | #endif /* CISCO_EXT */ |
| 905 | 905 | ||
| 906 | #define NUM_MODULES 2 | 906 | #define NUM_MODULES 2 |