diff options
author | Tony Olech <tony.olech@elandigitalsystems.com> | 2006-11-29 03:54:51 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-12-04 20:09:19 -0500 |
commit | 44e5e33e99e1b955ac6f0bb26abd9380629b48a9 (patch) | |
tree | 7ddeea7f1df67d061883e0d26cfcf9c83c900e38 /sound | |
parent | 6cf5be5112ecc5b0bded73bd2a64c1d46e4f6b8c (diff) |
[PATCH] pcmcia: IDs for Elan serial PCMCIA devcies
Add IDs for Elan serial PCMCIA devices. In addition, move the
pdaudio_cf driver from matching based on manf_id and card_id to
the more specific prod_id1 and prod_id2 to avoid false
positives.
Signed-off-by: Tony Olech <tony.olech@elandigitalsystems.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c index fd3590fcaedb..a31d80cd1655 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c | |||
@@ -299,7 +299,8 @@ static int pdacf_resume(struct pcmcia_device *link) | |||
299 | * Module entry points | 299 | * Module entry points |
300 | */ | 300 | */ |
301 | static struct pcmcia_device_id snd_pdacf_ids[] = { | 301 | static struct pcmcia_device_id snd_pdacf_ids[] = { |
302 | PCMCIA_DEVICE_MANF_CARD(0x015d, 0x4c45), | 302 | /* this is too general PCMCIA_DEVICE_MANF_CARD(0x015d, 0x4c45), */ |
303 | PCMCIA_DEVICE_PROD_ID12("Core Sound","PDAudio-CF",0x396d19d2,0x71717b49), | ||
303 | PCMCIA_DEVICE_NULL | 304 | PCMCIA_DEVICE_NULL |
304 | }; | 305 | }; |
305 | MODULE_DEVICE_TABLE(pcmcia, snd_pdacf_ids); | 306 | MODULE_DEVICE_TABLE(pcmcia, snd_pdacf_ids); |