diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-28 00:46:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-28 00:46:46 -0400 |
| commit | 2179a59db18ddf8eb3fd0133a3bee57f1c2b5b06 (patch) | |
| tree | 575f59b6a0918b11f7c763aecf0c3e70478460d2 /drivers/telephony/ixj_pcmcia.c | |
| parent | ad3fee560bc508008b3b2cf6358105c4c7081921 (diff) | |
| parent | 99f95e5286df2f69edab8a04c7080d986ee4233b (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/telephony/ixj_pcmcia.c')
| -rw-r--r-- | drivers/telephony/ixj_pcmcia.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/telephony/ixj_pcmcia.c b/drivers/telephony/ixj_pcmcia.c index e1ef0d7ee8d..ce5ebfe4af2 100644 --- a/drivers/telephony/ixj_pcmcia.c +++ b/drivers/telephony/ixj_pcmcia.c @@ -295,6 +295,12 @@ static int ixj_event(event_t event, int priority, event_callback_args_t * args) return 0; } +static struct pcmcia_device_id ixj_ids[] = { + PCMCIA_DEVICE_MANF_CARD(0x0257, 0x0600), + PCMCIA_DEVICE_NULL +}; +MODULE_DEVICE_TABLE(pcmcia, ixj_ids); + static struct pcmcia_driver ixj_driver = { .owner = THIS_MODULE, .drv = { @@ -302,6 +308,7 @@ static struct pcmcia_driver ixj_driver = { }, .attach = ixj_attach, .detach = ixj_detach, + .id_table = ixj_ids, }; static int __init ixj_pcmcia_init(void) |