diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/airo_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/atmel_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/b43/pcmcia.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/hostap/hostap_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/if_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/orinoco/orinoco_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/orinoco/spectrum_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ray_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/wl3501_cs.c | 2 |
9 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c index df2484d45474..c983c10e0f6a 100644 --- a/drivers/net/wireless/airo_cs.c +++ b/drivers/net/wireless/airo_cs.c | |||
@@ -164,7 +164,7 @@ static int airo_resume(struct pcmcia_device *link) | |||
164 | return 0; | 164 | return 0; |
165 | } | 165 | } |
166 | 166 | ||
167 | static struct pcmcia_device_id airo_ids[] = { | 167 | static const struct pcmcia_device_id airo_ids[] = { |
168 | PCMCIA_DEVICE_MANF_CARD(0x015f, 0x000a), | 168 | PCMCIA_DEVICE_MANF_CARD(0x015f, 0x000a), |
169 | PCMCIA_DEVICE_MANF_CARD(0x015f, 0x0005), | 169 | PCMCIA_DEVICE_MANF_CARD(0x015f, 0x0005), |
170 | PCMCIA_DEVICE_MANF_CARD(0x015f, 0x0007), | 170 | PCMCIA_DEVICE_MANF_CARD(0x015f, 0x0007), |
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c index 05263516c113..ec295c4f677d 100644 --- a/drivers/net/wireless/atmel_cs.c +++ b/drivers/net/wireless/atmel_cs.c | |||
@@ -122,7 +122,7 @@ static int atmel_config(struct pcmcia_device *link) | |||
122 | { | 122 | { |
123 | local_info_t *dev; | 123 | local_info_t *dev; |
124 | int ret; | 124 | int ret; |
125 | struct pcmcia_device_id *did; | 125 | const struct pcmcia_device_id *did; |
126 | 126 | ||
127 | dev = link->priv; | 127 | dev = link->priv; |
128 | did = dev_get_drvdata(&link->dev); | 128 | did = dev_get_drvdata(&link->dev); |
@@ -211,7 +211,7 @@ static int atmel_resume(struct pcmcia_device *link) | |||
211 | .prod_id_hash = { (vh1), (vh2), 0, 0 }, \ | 211 | .prod_id_hash = { (vh1), (vh2), 0, 0 }, \ |
212 | .driver_info = (kernel_ulong_t)(info), } | 212 | .driver_info = (kernel_ulong_t)(info), } |
213 | 213 | ||
214 | static struct pcmcia_device_id atmel_ids[] = { | 214 | static const struct pcmcia_device_id atmel_ids[] = { |
215 | PCMCIA_DEVICE_MANF_CARD_INFO(0x0101, 0x0620, ATMEL_FW_TYPE_502_3COM), | 215 | PCMCIA_DEVICE_MANF_CARD_INFO(0x0101, 0x0620, ATMEL_FW_TYPE_502_3COM), |
216 | PCMCIA_DEVICE_MANF_CARD_INFO(0x0101, 0x0696, ATMEL_FW_TYPE_502_3COM), | 216 | PCMCIA_DEVICE_MANF_CARD_INFO(0x0101, 0x0696, ATMEL_FW_TYPE_502_3COM), |
217 | PCMCIA_DEVICE_MANF_CARD_INFO(0x01bf, 0x3302, ATMEL_FW_TYPE_502E), | 217 | PCMCIA_DEVICE_MANF_CARD_INFO(0x01bf, 0x3302, ATMEL_FW_TYPE_502E), |
diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c index 7dcba5fafdc7..2c8461dcf1b0 100644 --- a/drivers/net/wireless/b43/pcmcia.c +++ b/drivers/net/wireless/b43/pcmcia.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include <pcmcia/cisreg.h> | 32 | #include <pcmcia/cisreg.h> |
33 | 33 | ||
34 | 34 | ||
35 | static /*const */ struct pcmcia_device_id b43_pcmcia_tbl[] = { | 35 | static const struct pcmcia_device_id b43_pcmcia_tbl[] = { |
36 | PCMCIA_DEVICE_MANF_CARD(0x2D0, 0x448), | 36 | PCMCIA_DEVICE_MANF_CARD(0x2D0, 0x448), |
37 | PCMCIA_DEVICE_MANF_CARD(0x2D0, 0x476), | 37 | PCMCIA_DEVICE_MANF_CARD(0x2D0, 0x476), |
38 | PCMCIA_DEVICE_NULL, | 38 | PCMCIA_DEVICE_NULL, |
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c index 2176edede39b..c052a0d5cbdd 100644 --- a/drivers/net/wireless/hostap/hostap_cs.c +++ b/drivers/net/wireless/hostap/hostap_cs.c | |||
@@ -620,7 +620,7 @@ static int hostap_cs_resume(struct pcmcia_device *link) | |||
620 | return 0; | 620 | return 0; |
621 | } | 621 | } |
622 | 622 | ||
623 | static struct pcmcia_device_id hostap_cs_ids[] = { | 623 | static const struct pcmcia_device_id hostap_cs_ids[] = { |
624 | PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100), | 624 | PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100), |
625 | PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300), | 625 | PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300), |
626 | PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), | 626 | PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), |
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c index 8712cb213f2f..01390158fafa 100644 --- a/drivers/net/wireless/libertas/if_cs.c +++ b/drivers/net/wireless/libertas/if_cs.c | |||
@@ -965,7 +965,7 @@ static void if_cs_detach(struct pcmcia_device *p_dev) | |||
965 | /* Module initialization */ | 965 | /* Module initialization */ |
966 | /********************************************************************/ | 966 | /********************************************************************/ |
967 | 967 | ||
968 | static struct pcmcia_device_id if_cs_ids[] = { | 968 | static const struct pcmcia_device_id if_cs_ids[] = { |
969 | PCMCIA_DEVICE_MANF_CARD(CF8305_MANFID, CF8305_CARDID), | 969 | PCMCIA_DEVICE_MANF_CARD(CF8305_MANFID, CF8305_CARDID), |
970 | PCMCIA_DEVICE_MANF_CARD(CF8381_MANFID, CF8381_CARDID), | 970 | PCMCIA_DEVICE_MANF_CARD(CF8381_MANFID, CF8381_CARDID), |
971 | PCMCIA_DEVICE_MANF_CARD(CF8385_MANFID, CF8385_CARDID), | 971 | PCMCIA_DEVICE_MANF_CARD(CF8385_MANFID, CF8385_CARDID), |
diff --git a/drivers/net/wireless/orinoco/orinoco_cs.c b/drivers/net/wireless/orinoco/orinoco_cs.c index 32954c4b243a..88e3c0ebcaad 100644 --- a/drivers/net/wireless/orinoco/orinoco_cs.c +++ b/drivers/net/wireless/orinoco/orinoco_cs.c | |||
@@ -237,7 +237,7 @@ static int orinoco_cs_resume(struct pcmcia_device *link) | |||
237 | /* Module initialization */ | 237 | /* Module initialization */ |
238 | /********************************************************************/ | 238 | /********************************************************************/ |
239 | 239 | ||
240 | static struct pcmcia_device_id orinoco_cs_ids[] = { | 240 | static const struct pcmcia_device_id orinoco_cs_ids[] = { |
241 | PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), /* 3Com AirConnect PCI 777A */ | 241 | PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), /* 3Com AirConnect PCI 777A */ |
242 | PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002), /* Lucent Orinoco and old Intersil */ | 242 | PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002), /* Lucent Orinoco and old Intersil */ |
243 | PCMCIA_DEVICE_MANF_CARD(0x016b, 0x0001), /* Ericsson WLAN Card C11 */ | 243 | PCMCIA_DEVICE_MANF_CARD(0x016b, 0x0001), /* Ericsson WLAN Card C11 */ |
diff --git a/drivers/net/wireless/orinoco/spectrum_cs.c b/drivers/net/wireless/orinoco/spectrum_cs.c index db34c282e59b..81f3673d31d4 100644 --- a/drivers/net/wireless/orinoco/spectrum_cs.c +++ b/drivers/net/wireless/orinoco/spectrum_cs.c | |||
@@ -301,7 +301,7 @@ spectrum_cs_resume(struct pcmcia_device *link) | |||
301 | /* Module initialization */ | 301 | /* Module initialization */ |
302 | /********************************************************************/ | 302 | /********************************************************************/ |
303 | 303 | ||
304 | static struct pcmcia_device_id spectrum_cs_ids[] = { | 304 | static const struct pcmcia_device_id spectrum_cs_ids[] = { |
305 | PCMCIA_DEVICE_MANF_CARD(0x026c, 0x0001), /* Symbol Spectrum24 LA4137 */ | 305 | PCMCIA_DEVICE_MANF_CARD(0x026c, 0x0001), /* Symbol Spectrum24 LA4137 */ |
306 | PCMCIA_DEVICE_MANF_CARD(0x0104, 0x0001), /* Socket Communications CF */ | 306 | PCMCIA_DEVICE_MANF_CARD(0x0104, 0x0001), /* Socket Communications CF */ |
307 | PCMCIA_DEVICE_PROD_ID12("Intel", "PRO/Wireless LAN PC Card", 0x816cc815, 0x6fbf459a), /* 2011B, not 2011 */ | 307 | PCMCIA_DEVICE_PROD_ID12("Intel", "PRO/Wireless LAN PC Card", 0x816cc815, 0x6fbf459a), /* 2011B, not 2011 */ |
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 0764d1a30d13..2a06ebcd67c5 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
@@ -2781,7 +2781,7 @@ static const struct file_operations int_proc_fops = { | |||
2781 | }; | 2781 | }; |
2782 | #endif | 2782 | #endif |
2783 | 2783 | ||
2784 | static struct pcmcia_device_id ray_ids[] = { | 2784 | static const struct pcmcia_device_id ray_ids[] = { |
2785 | PCMCIA_DEVICE_MANF_CARD(0x01a6, 0x0000), | 2785 | PCMCIA_DEVICE_MANF_CARD(0x01a6, 0x0000), |
2786 | PCMCIA_DEVICE_NULL, | 2786 | PCMCIA_DEVICE_NULL, |
2787 | }; | 2787 | }; |
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c index fc08f36fe1f5..6bc7c92fbff7 100644 --- a/drivers/net/wireless/wl3501_cs.c +++ b/drivers/net/wireless/wl3501_cs.c | |||
@@ -2000,7 +2000,7 @@ static int wl3501_resume(struct pcmcia_device *link) | |||
2000 | } | 2000 | } |
2001 | 2001 | ||
2002 | 2002 | ||
2003 | static struct pcmcia_device_id wl3501_ids[] = { | 2003 | static const struct pcmcia_device_id wl3501_ids[] = { |
2004 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0001), | 2004 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0001), |
2005 | PCMCIA_DEVICE_NULL | 2005 | PCMCIA_DEVICE_NULL |
2006 | }; | 2006 | }; |