Merge branch 'upstream-fixes'

[linux-2.6-omap-h63xx.git] / drivers / usb / serial / omninet.c

diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index f6327cc1b2e7b3ac7e636d91ef4543c27ce354b9..762d8ff9a1e4f808069cbd40dae6128d5f5e1521 100644 (file)
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -80,20 +80,20 @@ static struct usb_device_id id_table [] = {
 MODULE_DEVICE_TABLE (usb, id_table);
 
 static struct usb_driver omninet_driver = {
-       .owner =        THIS_MODULE,
        .name =         "omninet",
        .probe =        usb_serial_probe,
        .disconnect =   usb_serial_disconnect,
        .id_table =     id_table,
+       .no_dynamic_id =        1,
 };
 
 
 static struct usb_serial_driver zyxel_omninet_device = {
        .driver = {
                .owner =        THIS_MODULE,
+               .name =         "omninet",
        },
-       .name =                 "ZyXEL - omni.net lcd plus usb",
-       .short_name =           "omninet",
+       .description =          "ZyXEL - omni.net lcd plus usb",
        .id_table =             id_table,
        .num_interrupt_in =     1,
        .num_bulk_in =          1,