diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 16:28:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 16:28:35 -0400 |
| commit | f50d1d9e8d964fdd3b4cedfbca8843d1bc5916c1 (patch) | |
| tree | 105b5bc4bb96b555dba90fa11dd5af66784c132f /drivers/net/wireless/libertas | |
| parent | 98b98d316349e9a028e632629fe813d07fa5afdd (diff) | |
| parent | 4ef7e71444b48cc89152cbc499ed94dde50515ee (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
pcmcia: Make struct pcmcia_device_id const, sound drivers edition
staging: pcmcia: Convert pcmcia_device_id declarations to const
pcmcia: Convert pcmcia_device_id declarations to const
pcmcia: Make declaration and uses of struct pcmcia_device_id const
pcmcia/sa1100: put sa11x0_pcmcia_hw_init[] to .devinit.data
Diffstat (limited to 'drivers/net/wireless/libertas')
| -rw-r--r-- | drivers/net/wireless/libertas/if_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c index 63ed5798365c..e26935179861 100644 --- a/drivers/net/wireless/libertas/if_cs.c +++ b/drivers/net/wireless/libertas/if_cs.c | |||
| @@ -983,7 +983,7 @@ static void if_cs_detach(struct pcmcia_device *p_dev) | |||
| 983 | /* Module initialization */ | 983 | /* Module initialization */ |
| 984 | /********************************************************************/ | 984 | /********************************************************************/ |
| 985 | 985 | ||
| 986 | static struct pcmcia_device_id if_cs_ids[] = { | 986 | static const struct pcmcia_device_id if_cs_ids[] = { |
| 987 | PCMCIA_DEVICE_MANF_CARD(CF8305_MANFID, CF8305_CARDID), | 987 | PCMCIA_DEVICE_MANF_CARD(CF8305_MANFID, CF8305_CARDID), |
| 988 | PCMCIA_DEVICE_MANF_CARD(CF8381_MANFID, CF8381_CARDID), | 988 | PCMCIA_DEVICE_MANF_CARD(CF8381_MANFID, CF8381_CARDID), |
| 989 | PCMCIA_DEVICE_MANF_CARD(CF8385_MANFID, CF8385_CARDID), | 989 | PCMCIA_DEVICE_MANF_CARD(CF8385_MANFID, CF8385_CARDID), |