diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-11 04:02:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-11 04:02:40 +0000 |
| commit | e47f00743fc4776491344f2c618cc8dc2c23bcbc (patch) | |
| tree | 13e03a113a82a184c51c19c209867cfd3a59b3b9 /drivers/usb/serial/keyspan_pda.c | |
| parent | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (diff) | |
Merge with Linux 2.4.0.
Diffstat (limited to 'drivers/usb/serial/keyspan_pda.c')
| -rw-r--r-- | drivers/usb/serial/keyspan_pda.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c index b94c9766a..ef5e1263b 100644 --- a/drivers/usb/serial/keyspan_pda.c +++ b/drivers/usb/serial/keyspan_pda.c @@ -97,21 +97,21 @@ struct keyspan_pda_private { #define KEYSPAN_PDA_ID 0x0104 /* no clue */ static __devinitdata struct usb_device_id id_table_combined [] = { - { idVendor: KEYSPAN_VENDOR_ID, idProduct: KEYSPAN_PDA_FAKE_ID }, - { idVendor: KEYSPAN_VENDOR_ID, idProduct: KEYSPAN_PDA_ID }, - { } /* Terminating entry */ + { USB_DEVICE(KEYSPAN_VENDOR_ID, KEYSPAN_PDA_FAKE_ID) }, + { USB_DEVICE(KEYSPAN_VENDOR_ID, KEYSPAN_PDA_ID) }, + { } /* Terminating entry */ }; MODULE_DEVICE_TABLE (usb, id_table_combined); static __devinitdata struct usb_device_id id_table_std [] = { - { idVendor: KEYSPAN_VENDOR_ID, idProduct: KEYSPAN_PDA_ID }, - { } /* Terminating entry */ + { USB_DEVICE(KEYSPAN_VENDOR_ID, KEYSPAN_PDA_ID) }, + { } /* Terminating entry */ }; static __devinitdata struct usb_device_id id_table_fake [] = { - { idVendor: KEYSPAN_VENDOR_ID, idProduct: KEYSPAN_PDA_FAKE_ID }, - { } /* Terminating entry */ + { USB_DEVICE(KEYSPAN_VENDOR_ID, KEYSPAN_PDA_FAKE_ID) }, + { } /* Terminating entry */ }; static void keyspan_pda_wakeup_write( struct usb_serial_port *port ) |