diff options
| author | Tony Olech <tony.olech@elandigitalsystems.com> | 2006-11-29 09:54:51 +0100 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-12-05 02:09:19 +0100 |
| commit | 44e5e33e99e1b955ac6f0bb26abd9380629b48a9 (patch) | |
| tree | 7ddeea7f1df67d061883e0d26cfcf9c83c900e38 /drivers/parport/parport_cs.c | |
| parent | [PATCH] pcmcia: allow for four multifunction subdevices (diff) | |
| download | linux-44e5e33e99e1b955ac6f0bb26abd9380629b48a9.tar.xz linux-44e5e33e99e1b955ac6f0bb26abd9380629b48a9.zip | |
[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 'drivers/parport/parport_cs.c')
| -rw-r--r-- | drivers/parport/parport_cs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c index b953d5907c05..fb80fed0da0c 100644 --- a/drivers/parport/parport_cs.c +++ b/drivers/parport/parport_cs.c @@ -263,6 +263,7 @@ void parport_cs_release(struct pcmcia_device *link) static struct pcmcia_device_id parport_ids[] = { PCMCIA_DEVICE_FUNC_ID(3), + PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial+Parallel Port: SP230",0x3beb8cf2,0xdb9e58bc), PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0003), PCMCIA_DEVICE_NULL }; |