1 files changed, 18 insertions, 12 deletions

diff --git a/drivers/usb/serial/io_tables.h b/drivers/usb/serial/io_tables.h
index e7ffe02408bd..fad561c04c76 100644
--- a/drivers/usb/serial/io_tables.h
+++ b/drivers/usb/serial/io_tables.h
@@ -75,10 +75,12 @@ static struct usb_device_id id_table_combined [] = {
 
 MODULE_DEVICE_TABLE (usb, id_table_combined);
 
-static struct usb_serial_device_type edgeport_2port_device = {
-        .owner                  = THIS_MODULE,
-        .name                   = "Edgeport 2 port adapter",
-        .short_name             = "edgeport_2",
+static struct usb_serial_driver edgeport_2port_device = {
+        .driver = {
+                .owner          = THIS_MODULE,
+                .name           = "edgeport_2",
+        },
+        .description            = "Edgeport 2 port adapter",
         .id_table               = edgeport_2port_id_table,
         .num_interrupt_in       = 1,
         .num_bulk_in            = 1,
@@ -103,10 +105,12 @@ static struct usb_serial_device_type edgeport_2port_device = {
         .write_bulk_callback    = edge_bulk_out_data_callback,
 };
 
-static struct usb_serial_device_type edgeport_4port_device = {
-        .owner                  = THIS_MODULE,
-        .name                   = "Edgeport 4 port adapter",
-        .short_name             = "edgeport_4",
+static struct usb_serial_driver edgeport_4port_device = {
+        .driver = {
+                .owner          = THIS_MODULE,
+                .name           = "edgeport_4",
+        },
+        .description            = "Edgeport 4 port adapter",
         .id_table               = edgeport_4port_id_table,
         .num_interrupt_in       = 1,
         .num_bulk_in            = 1,
@@ -131,10 +135,12 @@ static struct usb_serial_device_type edgeport_4port_device = {
         .write_bulk_callback    = edge_bulk_out_data_callback,
 };
 
-static struct usb_serial_device_type edgeport_8port_device = {
-        .owner                  = THIS_MODULE,
-        .name                   = "Edgeport 8 port adapter",
-        .short_name             = "edgeport_8",
+static struct usb_serial_driver edgeport_8port_device = {
+        .driver = {
+                .owner          = THIS_MODULE,
+                .name           = "edgeport_8",
+        },
+        .description            = "Edgeport 8 port adapter",
         .id_table               = edgeport_8port_id_table,
         .num_interrupt_in       = 1,
         .num_bulk_in            = 1,