diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 13:28:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 13:28:35 -0700 |
| commit | f50d1d9e8d964fdd3b4cedfbca8843d1bc5916c1 (patch) | |
| tree | 105b5bc4bb96b555dba90fa11dd5af66784c132f /drivers/net/pcmcia/axnet_cs.c | |
| parent | 98b98d316349e9a028e632629fe813d07fa5afdd (diff) | |
| parent | 4ef7e71444b48cc89152cbc499ed94dde50515ee (diff) | |
| download | op-kernel-dev-f50d1d9e8d964fdd3b4cedfbca8843d1bc5916c1.zip op-kernel-dev-f50d1d9e8d964fdd3b4cedfbca8843d1bc5916c1.tar.gz | |
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/axnet_cs.c')
| -rw-r--r-- | drivers/net/pcmcia/axnet_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 3077d72..9953db7 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c @@ -687,7 +687,7 @@ static void block_output(struct net_device *dev, int count, outsw(nic_base + AXNET_DATAPORT, buf, count>>1); } -static struct pcmcia_device_id axnet_ids[] = { +static const struct pcmcia_device_id axnet_ids[] = { PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x016c, 0x0081), PCMCIA_DEVICE_MANF_CARD(0x018a, 0x0301), PCMCIA_DEVICE_MANF_CARD(0x01bf, 0x2328), |
