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/pcmcia/3c574_cs.c | |
| 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/pcmcia/3c574_cs.c')
| -rw-r--r-- | drivers/net/pcmcia/3c574_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c index 81ac330f931d..34c5e1cbf65d 100644 --- a/drivers/net/pcmcia/3c574_cs.c +++ b/drivers/net/pcmcia/3c574_cs.c | |||
| @@ -1150,7 +1150,7 @@ static int el3_close(struct net_device *dev) | |||
| 1150 | return 0; | 1150 | return 0; |
| 1151 | } | 1151 | } |
| 1152 | 1152 | ||
| 1153 | static struct pcmcia_device_id tc574_ids[] = { | 1153 | static const struct pcmcia_device_id tc574_ids[] = { |
| 1154 | PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0574), | 1154 | PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0574), |
| 1155 | PCMCIA_MFC_DEVICE_CIS_MANF_CARD(0, 0x0101, 0x0556, "cis/3CCFEM556.cis"), | 1155 | PCMCIA_MFC_DEVICE_CIS_MANF_CARD(0, 0x0101, 0x0556, "cis/3CCFEM556.cis"), |
| 1156 | PCMCIA_DEVICE_NULL, | 1156 | PCMCIA_DEVICE_NULL, |