Merge branch 'master'

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c
index 85e242459c27..a02fada85362 100644
--- a/drivers/usb/serial/ipw.c
+++ b/drivers/usb/serial/ipw.c
@@ -443,10 +443,12 @@ static int ipw_disconnect(struct usb_serial_port *port)
         return 0;
 }
 
-static struct usb_serial_device_type ipw_device = {
-        .owner =                THIS_MODULE,
-        .name =                 "IPWireless converter",
-        .short_name =           "ipw",
+static struct usb_serial_driver ipw_device = {
+        .driver = {
+                .owner =        THIS_MODULE,
+                .name =         "ipw",
+        },
+        .description =          "IPWireless converter",
         .id_table =             usb_ipw_ids,
         .num_interrupt_in =     NUM_DONT_CARE,
         .num_bulk_in =          1,