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/can | |
| 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/can')
| -rw-r--r-- | drivers/net/can/softing/softing_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/softing/softing_cs.c b/drivers/net/can/softing/softing_cs.c index c11bb4de8630..c0e1b1eb87a9 100644 --- a/drivers/net/can/softing/softing_cs.c +++ b/drivers/net/can/softing/softing_cs.c | |||
| @@ -315,7 +315,7 @@ pcmcia_failed: | |||
| 315 | return ret ?: -ENODEV; | 315 | return ret ?: -ENODEV; |
| 316 | } | 316 | } |
| 317 | 317 | ||
| 318 | static /*const*/ struct pcmcia_device_id softingcs_ids[] = { | 318 | static const struct pcmcia_device_id softingcs_ids[] = { |
| 319 | /* softing */ | 319 | /* softing */ |
| 320 | PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0001), | 320 | PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0001), |
| 321 | PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0002), | 321 | PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0002), |