aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/atmel_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/atmel_cs.c')
-rw-r--r--drivers/net/wireless/atmel_cs.c4
1 files changed, 2 insertions, 2 deletions
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
214static struct pcmcia_device_id atmel_ids[] = { 214static 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),