diff options
Diffstat (limited to 'drivers/usb/serial/belkin_sa.c')
-rw-r--r-- | drivers/usb/serial/belkin_sa.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c index 13031bb1e2cb..5965df72cd07 100644 --- a/drivers/usb/serial/belkin_sa.c +++ b/drivers/usb/serial/belkin_sa.c | |||
@@ -62,7 +62,7 @@ static int belkin_sa_tiocmset(struct tty_struct *tty, | |||
62 | unsigned int set, unsigned int clear); | 62 | unsigned int set, unsigned int clear); |
63 | 63 | ||
64 | 64 | ||
65 | static const struct usb_device_id id_table_combined[] = { | 65 | static const struct usb_device_id id_table[] = { |
66 | { USB_DEVICE(BELKIN_SA_VID, BELKIN_SA_PID) }, | 66 | { USB_DEVICE(BELKIN_SA_VID, BELKIN_SA_PID) }, |
67 | { USB_DEVICE(BELKIN_OLD_VID, BELKIN_OLD_PID) }, | 67 | { USB_DEVICE(BELKIN_OLD_VID, BELKIN_OLD_PID) }, |
68 | { USB_DEVICE(PERACOM_VID, PERACOM_PID) }, | 68 | { USB_DEVICE(PERACOM_VID, PERACOM_PID) }, |
@@ -71,12 +71,7 @@ static const struct usb_device_id id_table_combined[] = { | |||
71 | { USB_DEVICE(BELKIN_DOCKSTATION_VID, BELKIN_DOCKSTATION_PID) }, | 71 | { USB_DEVICE(BELKIN_DOCKSTATION_VID, BELKIN_DOCKSTATION_PID) }, |
72 | { } /* Terminating entry */ | 72 | { } /* Terminating entry */ |
73 | }; | 73 | }; |
74 | MODULE_DEVICE_TABLE(usb, id_table_combined); | 74 | MODULE_DEVICE_TABLE(usb, id_table); |
75 | |||
76 | static struct usb_driver belkin_driver = { | ||
77 | .name = "belkin", | ||
78 | .id_table = id_table_combined, | ||
79 | }; | ||
80 | 75 | ||
81 | /* All of the device info needed for the serial converters */ | 76 | /* All of the device info needed for the serial converters */ |
82 | static struct usb_serial_driver belkin_device = { | 77 | static struct usb_serial_driver belkin_device = { |
@@ -85,7 +80,7 @@ static struct usb_serial_driver belkin_device = { | |||
85 | .name = "belkin", | 80 | .name = "belkin", |
86 | }, | 81 | }, |
87 | .description = "Belkin / Peracom / GoHubs USB Serial Adapter", | 82 | .description = "Belkin / Peracom / GoHubs USB Serial Adapter", |
88 | .id_table = id_table_combined, | 83 | .id_table = id_table, |
89 | .num_ports = 1, | 84 | .num_ports = 1, |
90 | .open = belkin_sa_open, | 85 | .open = belkin_sa_open, |
91 | .close = belkin_sa_close, | 86 | .close = belkin_sa_close, |
@@ -513,7 +508,7 @@ exit: | |||
513 | return retval; | 508 | return retval; |
514 | } | 509 | } |
515 | 510 | ||
516 | module_usb_serial_driver(belkin_driver, serial_drivers); | 511 | module_usb_serial_driver(serial_drivers, id_table); |
517 | 512 | ||
518 | MODULE_AUTHOR(DRIVER_AUTHOR); | 513 | MODULE_AUTHOR(DRIVER_AUTHOR); |
519 | MODULE_DESCRIPTION(DRIVER_DESC); | 514 | MODULE_DESCRIPTION(DRIVER_DESC); |