diff options
Diffstat (limited to 'drivers/usb/serial/mct_u232.c')
-rw-r--r-- | drivers/usb/serial/mct_u232.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c index a63d1e8be91..d0ec1aa5271 100644 --- a/drivers/usb/serial/mct_u232.c +++ b/drivers/usb/serial/mct_u232.c | |||
@@ -73,20 +73,14 @@ static void mct_u232_unthrottle(struct tty_struct *tty); | |||
73 | /* | 73 | /* |
74 | * All of the device info needed for the MCT USB-RS232 converter. | 74 | * All of the device info needed for the MCT USB-RS232 converter. |
75 | */ | 75 | */ |
76 | static const struct usb_device_id id_table_combined[] = { | 76 | static const struct usb_device_id id_table[] = { |
77 | { USB_DEVICE(MCT_U232_VID, MCT_U232_PID) }, | 77 | { USB_DEVICE(MCT_U232_VID, MCT_U232_PID) }, |
78 | { USB_DEVICE(MCT_U232_VID, MCT_U232_SITECOM_PID) }, | 78 | { USB_DEVICE(MCT_U232_VID, MCT_U232_SITECOM_PID) }, |
79 | { USB_DEVICE(MCT_U232_VID, MCT_U232_DU_H3SP_PID) }, | 79 | { USB_DEVICE(MCT_U232_VID, MCT_U232_DU_H3SP_PID) }, |
80 | { USB_DEVICE(MCT_U232_BELKIN_F5U109_VID, MCT_U232_BELKIN_F5U109_PID) }, | 80 | { USB_DEVICE(MCT_U232_BELKIN_F5U109_VID, MCT_U232_BELKIN_F5U109_PID) }, |
81 | { } /* Terminating entry */ | 81 | { } /* Terminating entry */ |
82 | }; | 82 | }; |
83 | 83 | MODULE_DEVICE_TABLE(usb, id_table); | |
84 | MODULE_DEVICE_TABLE(usb, id_table_combined); | ||
85 | |||
86 | static struct usb_driver mct_u232_driver = { | ||
87 | .name = "mct_u232", | ||
88 | .id_table = id_table_combined, | ||
89 | }; | ||
90 | 84 | ||
91 | static struct usb_serial_driver mct_u232_device = { | 85 | static struct usb_serial_driver mct_u232_device = { |
92 | .driver = { | 86 | .driver = { |
@@ -94,7 +88,7 @@ static struct usb_serial_driver mct_u232_device = { | |||
94 | .name = "mct_u232", | 88 | .name = "mct_u232", |
95 | }, | 89 | }, |
96 | .description = "MCT U232", | 90 | .description = "MCT U232", |
97 | .id_table = id_table_combined, | 91 | .id_table = id_table, |
98 | .num_ports = 1, | 92 | .num_ports = 1, |
99 | .open = mct_u232_open, | 93 | .open = mct_u232_open, |
100 | .close = mct_u232_close, | 94 | .close = mct_u232_close, |
@@ -887,7 +881,7 @@ static int mct_u232_get_icount(struct tty_struct *tty, | |||
887 | return 0; | 881 | return 0; |
888 | } | 882 | } |
889 | 883 | ||
890 | module_usb_serial_driver(mct_u232_driver, serial_drivers); | 884 | module_usb_serial_driver(serial_drivers, id_table); |
891 | 885 | ||
892 | MODULE_AUTHOR(DRIVER_AUTHOR); | 886 | MODULE_AUTHOR(DRIVER_AUTHOR); |
893 | MODULE_DESCRIPTION(DRIVER_DESC); | 887 | MODULE_DESCRIPTION(DRIVER_DESC); |