diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 22:28:35 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 22:28:35 +0200 |
| commit | f50d1d9e8d964fdd3b4cedfbca8843d1bc5916c1 (patch) | |
| tree | 105b5bc4bb96b555dba90fa11dd5af66784c132f /drivers/net/pcmcia/3c589_cs.c | |
| parent | Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | pcmcia: Make struct pcmcia_device_id const, sound drivers edition (diff) | |
| download | linux-f50d1d9e8d964fdd3b4cedfbca8843d1bc5916c1.tar.xz linux-f50d1d9e8d964fdd3b4cedfbca8843d1bc5916c1.zip | |
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/3c589_cs.c')
| -rw-r--r-- | drivers/net/pcmcia/3c589_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c index 79b9ca0dbdb4..4a1a35809807 100644 --- a/drivers/net/pcmcia/3c589_cs.c +++ b/drivers/net/pcmcia/3c589_cs.c @@ -908,7 +908,7 @@ static int el3_close(struct net_device *dev) return 0; } -static struct pcmcia_device_id tc589_ids[] = { +static const struct pcmcia_device_id tc589_ids[] = { PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0101, 0x0562), PCMCIA_MFC_DEVICE_PROD_ID1(0, "Motorola MARQUIS", 0xf03e4e77), PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0589), |