diff options
author | John W. Linville <linville@tuxdriver.com> | 2010-09-21 15:49:14 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-09-21 15:49:14 -0400 |
commit | b618f6f885579a6237e5bf4582fa6167972ddef4 (patch) | |
tree | b11508178570b98ce9cb2d76ecebd046a6f0e77c /drivers/net/wireless/airo.c | |
parent | 462fb2af9788a82a534f8184abfde31574e1cfa0 (diff) | |
parent | 6e5c2b4e8addfaab8ef54dedaf7b607e1585c35b (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
arch/arm/mach-omap2/board-omap3pandora.c
drivers/net/wireless/ath/ath5k/base.c
Diffstat (limited to 'drivers/net/wireless/airo.c')
-rw-r--r-- | drivers/net/wireless/airo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 7d26506957d..924ed095dd9 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
@@ -105,7 +105,7 @@ static struct pci_driver airo_driver = { | |||
105 | of statistics in the /proc filesystem */ | 105 | of statistics in the /proc filesystem */ |
106 | 106 | ||
107 | #define IGNLABEL(comment) NULL | 107 | #define IGNLABEL(comment) NULL |
108 | static char *statsLabels[] = { | 108 | static const char *statsLabels[] = { |
109 | "RxOverrun", | 109 | "RxOverrun", |
110 | IGNLABEL("RxPlcpCrcErr"), | 110 | IGNLABEL("RxPlcpCrcErr"), |
111 | IGNLABEL("RxPlcpFormatErr"), | 111 | IGNLABEL("RxPlcpFormatErr"), |
@@ -932,7 +932,7 @@ typedef struct aironet_ioctl { | |||
932 | unsigned char __user *data; // d-data | 932 | unsigned char __user *data; // d-data |
933 | } aironet_ioctl; | 933 | } aironet_ioctl; |
934 | 934 | ||
935 | static char swversion[] = "2.1"; | 935 | static const char swversion[] = "2.1"; |
936 | #endif /* CISCO_EXT */ | 936 | #endif /* CISCO_EXT */ |
937 | 937 | ||
938 | #define NUM_MODULES 2 | 938 | #define NUM_MODULES 2 |
@@ -1374,7 +1374,7 @@ static int micsetup(struct airo_info *ai) { | |||
1374 | return SUCCESS; | 1374 | return SUCCESS; |
1375 | } | 1375 | } |
1376 | 1376 | ||
1377 | static char micsnap[] = {0xAA,0xAA,0x03,0x00,0x40,0x96,0x00,0x02}; | 1377 | static const u8 micsnap[] = {0xAA,0xAA,0x03,0x00,0x40,0x96,0x00,0x02}; |
1378 | 1378 | ||
1379 | /*=========================================================================== | 1379 | /*=========================================================================== |
1380 | * Description: Mic a packet | 1380 | * Description: Mic a packet |
@@ -5023,7 +5023,7 @@ static void proc_config_on_close(struct inode *inode, struct file *file) | |||
5023 | airo_config_commit(dev, NULL, NULL, NULL); | 5023 | airo_config_commit(dev, NULL, NULL, NULL); |
5024 | } | 5024 | } |
5025 | 5025 | ||
5026 | static char *get_rmode(__le16 mode) | 5026 | static const char *get_rmode(__le16 mode) |
5027 | { | 5027 | { |
5028 | switch(mode & RXMODE_MASK) { | 5028 | switch(mode & RXMODE_MASK) { |
5029 | case RXMODE_RFMON: return "rfmon"; | 5029 | case RXMODE_RFMON: return "rfmon"; |