diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-25 19:41:21 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-25 19:41:21 -0400 |
| commit | ae1d3b974e091b5fc9008bd41bcbdaac68110b62 (patch) | |
| tree | 82e50a66925ced79f59ed4504f6e073ef55edee3 /sound | |
| parent | 586893ebc42943008010b4c210cfc9167df615e5 (diff) | |
| parent | 7a2207a0e1142a9b214b323e43ab2ecc592e5b0e (diff) | |
Merge branch 'for-rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf.c | 2 | ||||
| -rw-r--r-- | sound/pcmcia/vx/vxpocket.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c index 8cc4733698a0..ce33be0e4e98 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c | |||
| @@ -278,7 +278,7 @@ static int pdacf_resume(struct pcmcia_device *link) | |||
| 278 | /* | 278 | /* |
| 279 | * Module entry points | 279 | * Module entry points |
| 280 | */ | 280 | */ |
| 281 | static struct pcmcia_device_id snd_pdacf_ids[] = { | 281 | static const struct pcmcia_device_id snd_pdacf_ids[] = { |
| 282 | /* this is too general PCMCIA_DEVICE_MANF_CARD(0x015d, 0x4c45), */ | 282 | /* this is too general PCMCIA_DEVICE_MANF_CARD(0x015d, 0x4c45), */ |
| 283 | PCMCIA_DEVICE_PROD_ID12("Core Sound","PDAudio-CF",0x396d19d2,0x71717b49), | 283 | PCMCIA_DEVICE_PROD_ID12("Core Sound","PDAudio-CF",0x396d19d2,0x71717b49), |
| 284 | PCMCIA_DEVICE_NULL | 284 | PCMCIA_DEVICE_NULL |
diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c index 80000d631f88..d9ef21d8fa73 100644 --- a/sound/pcmcia/vx/vxpocket.c +++ b/sound/pcmcia/vx/vxpocket.c | |||
| @@ -350,7 +350,7 @@ static void vxpocket_detach(struct pcmcia_device *link) | |||
| 350 | * Module entry points | 350 | * Module entry points |
| 351 | */ | 351 | */ |
| 352 | 352 | ||
| 353 | static struct pcmcia_device_id vxp_ids[] = { | 353 | static const struct pcmcia_device_id vxp_ids[] = { |
| 354 | PCMCIA_DEVICE_MANF_CARD(0x01f1, 0x0100), | 354 | PCMCIA_DEVICE_MANF_CARD(0x01f1, 0x0100), |
| 355 | PCMCIA_DEVICE_NULL | 355 | PCMCIA_DEVICE_NULL |
| 356 | }; | 356 | }; |