aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/mct_u232.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-28 21:08:14 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-28 21:08:14 -0700
commit1f419cadff55f548e7356ffebdb9e1b5a8c22275 (patch)
tree07c04d053322e9913a6b445b2fe00510299e97cf /drivers/usb/serial/mct_u232.c
parent974f7bc5781d3fc16e32d8908c6e48592e767dd2 (diff)
parent4303fc6f055cf1a7ec63c3c3fd777b91b7d576f1 (diff)
downloadkernel_samsung_aries-1f419cadff55f548e7356ffebdb9e1b5a8c22275.zip
kernel_samsung_aries-1f419cadff55f548e7356ffebdb9e1b5a8c22275.tar.gz
kernel_samsung_aries-1f419cadff55f548e7356ffebdb9e1b5a8c22275.tar.bz2
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/usb/serial/mct_u232.c')
-rw-r--r--drivers/usb/serial/mct_u232.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index 50b63696..ca5dbad 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,