diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 17:55:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 17:55:50 -0400 |
| commit | 61cca8c72eb284e80876bafdea057055f6e793e4 (patch) | |
| tree | 5bb92477b811e64e88c9f0c119acb2c9e9804c91 /drivers/net/wireless/airo.c | |
| parent | e494f6333bef20fd9d8689062260c5d0136a3ea0 (diff) | |
| parent | e254e9bff5283aad1af6d74d2a312ee011b84d61 (diff) | |
Merge 'upstream' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/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 |