diff options
| author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-10-29 03:10:35 -0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-10-29 03:10:35 -0200 |
| commit | fc228a04a4c01bbb2f898e180a14f9a976001f79 (patch) | |
| tree | c6015f399aac7f0566dfadb984d843fe67175329 /drivers/usb/serial/mct_u232.c | |
| parent | 9fcc2e8a752f7d3d889114221b67c459557823e9 (diff) | |
| parent | 8a212ab6b8a4ccc6f3c3d1beba5f92655c576404 (diff) | |
| download | blackbird-obmc-linux-fc228a04a4c01bbb2f898e180a14f9a976001f79.tar.gz blackbird-obmc-linux-fc228a04a4c01bbb2f898e180a14f9a976001f79.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/usb/serial/mct_u232.c')
| -rw-r--r-- | drivers/usb/serial/mct_u232.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c index 50b6369647d2..ca5dbadb9b7e 100644 --- a/drivers/usb/serial/mct_u232.c +++ b/drivers/usb/serial/mct_u232.c @@ -132,10 +132,12 @@ static struct usb_driver mct_u232_driver = { .id_table = id_table_combined, }; -static struct usb_serial_device_type mct_u232_device = { - .owner = THIS_MODULE, - .name = "MCT U232", - .short_name = "mct_u232", +static struct usb_serial_driver mct_u232_device = { + .driver = { + .owner = THIS_MODULE, + .name = "mct_u232", + }, + .description = "MCT U232", .id_table = id_table_combined, .num_interrupt_in = 2, .num_bulk_in = 0, |
