Merge ../linux-2.6 by hand

1 files changed, 18 insertions, 12 deletions

diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index 635c384cb15a..cd4f48bd83b6 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -783,10 +783,12 @@ static void keyspan_pda_shutdown (struct usb_serial *serial)
 }
 
 #ifdef KEYSPAN
-static struct usb_serial_device_type keyspan_pda_fake_device = {
-        .owner =                THIS_MODULE,
-        .name =                 "Keyspan PDA - (prerenumeration)",
-        .short_name =           "keyspan_pda_pre",
+static struct usb_serial_driver keyspan_pda_fake_device = {
+        .driver = {
+                .owner =        THIS_MODULE,
+                .name =         "keyspan_pda_pre",
+        },
+        .description =          "Keyspan PDA - (prerenumeration)",
         .id_table =             id_table_fake,
         .num_interrupt_in =     NUM_DONT_CARE,
         .num_bulk_in =          NUM_DONT_CARE,
@@ -797,10 +799,12 @@ static struct usb_serial_device_type keyspan_pda_fake_device = {
 #endif
 
 #ifdef XIRCOM
-static struct usb_serial_device_type xircom_pgs_fake_device = {
-        .owner =                THIS_MODULE,
-        .name =                 "Xircom / Entregra PGS - (prerenumeration)",
-        .short_name =           "xircom_no_firm",
+static struct usb_serial_driver xircom_pgs_fake_device = {
+        .driver = {
+                .owner =        THIS_MODULE,
+                .name =         "xircom_no_firm",
+        },
+        .description =          "Xircom / Entregra PGS - (prerenumeration)",
         .id_table =             id_table_fake_xircom,
         .num_interrupt_in =     NUM_DONT_CARE,
         .num_bulk_in =          NUM_DONT_CARE,
@@ -810,10 +814,12 @@ static struct usb_serial_device_type xircom_pgs_fake_device = {
 };
 #endif
 
-static struct usb_serial_device_type keyspan_pda_device = {
-        .owner =                THIS_MODULE,
-        .name =                 "Keyspan PDA",
-        .short_name =           "keyspan_pda",
+static struct usb_serial_driver keyspan_pda_device = {
+        .driver = {
+                .owner =        THIS_MODULE,
+                .name =         "keyspan_pda",
+        },
+        .description =          "Keyspan PDA",
         .id_table =             id_table_std,
         .num_interrupt_in =     1,
         .num_bulk_in =          0,