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/parport | |
| 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/parport')
| -rw-r--r-- | drivers/parport/parport_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c index 787ebdeae310..067ad517c1f5 100644 --- a/drivers/parport/parport_cs.c +++ b/drivers/parport/parport_cs.c | |||
| @@ -178,7 +178,7 @@ static void parport_cs_release(struct pcmcia_device *link) | |||
| 178 | } /* parport_cs_release */ | 178 | } /* parport_cs_release */ |
| 179 | 179 | ||
| 180 | 180 | ||
| 181 | static struct pcmcia_device_id parport_ids[] = { | 181 | static const struct pcmcia_device_id parport_ids[] = { |
| 182 | PCMCIA_DEVICE_FUNC_ID(3), | 182 | PCMCIA_DEVICE_FUNC_ID(3), |
| 183 | PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial+Parallel Port: SP230",0x3beb8cf2,0xdb9e58bc), | 183 | PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial+Parallel Port: SP230",0x3beb8cf2,0xdb9e58bc), |
| 184 | PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0003), | 184 | PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0003), |