diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 00:08:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 00:08:14 -0400 |
| commit | 1f419cadff55f548e7356ffebdb9e1b5a8c22275 (patch) | |
| tree | 07c04d053322e9913a6b445b2fe00510299e97cf /drivers/usb/serial/generic.c | |
| parent | 974f7bc5781d3fc16e32d8908c6e48592e767dd2 (diff) | |
| parent | 4303fc6f055cf1a7ec63c3c3fd777b91b7d576f1 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/usb/serial/generic.c')
| -rw-r--r-- | drivers/usb/serial/generic.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c index 5f7d3193d355..8909208f506a 100644 --- a/drivers/usb/serial/generic.c +++ b/drivers/usb/serial/generic.c | |||
| @@ -36,10 +36,11 @@ MODULE_PARM_DESC(product, "User specified USB idProduct"); | |||
| 36 | static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */ | 36 | static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */ |
| 37 | 37 | ||
| 38 | /* All of the device info needed for the Generic Serial Converter */ | 38 | /* All of the device info needed for the Generic Serial Converter */ |
| 39 | struct usb_serial_device_type usb_serial_generic_device = { | 39 | struct usb_serial_driver usb_serial_generic_device = { |
| 40 | .owner = THIS_MODULE, | 40 | .driver = { |
| 41 | .name = "Generic", | 41 | .owner = THIS_MODULE, |
| 42 | .short_name = "generic", | 42 | .name = "generic", |
| 43 | }, | ||
| 43 | .id_table = generic_device_ids, | 44 | .id_table = generic_device_ids, |
| 44 | .num_interrupt_in = NUM_DONT_CARE, | 45 | .num_interrupt_in = NUM_DONT_CARE, |
| 45 | .num_bulk_in = NUM_DONT_CARE, | 46 | .num_bulk_in = NUM_DONT_CARE, |