diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-01-05 22:25:13 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-01-05 22:25:13 -0500 |
| commit | fed8bf19ec20efc0641740b2d10aa589dbd6d1ab (patch) | |
| tree | c104a13c7b8cb7f4152b15729dc5aede7c063e91 /drivers/usb/serial/keyspan.h | |
| parent | e7c3aad53dba54d375b632f2a21b680546828dec (diff) | |
| parent | 46f25dffbaba48c571d75f5f574f31978287b8d2 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/usb/serial/keyspan.h')
| -rw-r--r-- | drivers/usb/serial/keyspan.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h index 5cfc13b5e56f..7472ed6bf626 100644 --- a/drivers/usb/serial/keyspan.h +++ b/drivers/usb/serial/keyspan.h | |||
| @@ -520,11 +520,11 @@ static struct usb_device_id keyspan_ids_combined[] = { | |||
| 520 | MODULE_DEVICE_TABLE(usb, keyspan_ids_combined); | 520 | MODULE_DEVICE_TABLE(usb, keyspan_ids_combined); |
| 521 | 521 | ||
| 522 | static struct usb_driver keyspan_driver = { | 522 | static struct usb_driver keyspan_driver = { |
| 523 | .owner = THIS_MODULE, | ||
| 524 | .name = "keyspan", | 523 | .name = "keyspan", |
| 525 | .probe = usb_serial_probe, | 524 | .probe = usb_serial_probe, |
| 526 | .disconnect = usb_serial_disconnect, | 525 | .disconnect = usb_serial_disconnect, |
| 527 | .id_table = keyspan_ids_combined, | 526 | .id_table = keyspan_ids_combined, |
| 527 | .no_dynamic_id = 1, | ||
| 528 | }; | 528 | }; |
| 529 | 529 | ||
| 530 | /* usb_device_id table for the pre-firmware download keyspan devices */ | 530 | /* usb_device_id table for the pre-firmware download keyspan devices */ |