Merge branch 'upstream'

[powerpc.git] / drivers / usb / serial / io_tables.h

diff --git a/drivers/usb/serial/io_tables.h b/drivers/usb/serial/io_tables.h
index 7314c04..fad561c 100644 (file)
--- a/drivers/usb/serial/io_tables.h
+++ b/drivers/usb/serial/io_tables.h
@@ -76,9 +76,11 @@ static struct usb_device_id id_table_combined [] = {
 MODULE_DEVICE_TABLE (usb, id_table_combined);
 
 static struct usb_serial_driver edgeport_2port_device = {
-       .owner                  = THIS_MODULE,
-       .name                   = "Edgeport 2 port adapter",
-       .short_name             = "edgeport_2",
+       .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,
@@ -104,9 +106,11 @@ static struct usb_serial_driver edgeport_2port_device = {
 };
 
 static struct usb_serial_driver edgeport_4port_device = {
-       .owner                  = THIS_MODULE,
-       .name                   = "Edgeport 4 port adapter",
-       .short_name             = "edgeport_4",
+       .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,
@@ -132,9 +136,11 @@ static struct usb_serial_driver edgeport_4port_device = {
 };
 
 static struct usb_serial_driver edgeport_8port_device = {
-       .owner                  = THIS_MODULE,
-       .name                   = "Edgeport 8 port adapter",
-       .short_name             = "edgeport_8",
+       .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,