diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-06 12:26:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-06 12:26:02 +0100 |
| commit | aa72f6899b9fb3dc824c458234ae3507a60e462d (patch) | |
| tree | 97480a3cefc3d864ffd6eb994ec09ab5d680eabe /sound/pcmcia/pdaudiocf/pdaudiocf.c | |
| parent | e6a9be0bb018466896632969ba4b496d1a7caea9 (diff) | |
| parent | 05d3962cc921c51059df69488c7f70ab8b6a5d88 (diff) | |
Merge branch 'for-3.0' into for-3.1
Diffstat (limited to 'sound/pcmcia/pdaudiocf/pdaudiocf.c')
| -rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c index 8cc4733698a..ce33be0e4e9 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) /* * Module entry points */ -static struct pcmcia_device_id snd_pdacf_ids[] = { +static const struct pcmcia_device_id snd_pdacf_ids[] = { /* this is too general PCMCIA_DEVICE_MANF_CARD(0x015d, 0x4c45), */ PCMCIA_DEVICE_PROD_ID12("Core Sound","PDAudio-CF",0x396d19d2,0x71717b49), PCMCIA_DEVICE_NULL |