Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / usb / serial / keyspan.h

diff --git a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h
index e9b45b7..7472ed6 100644 (file)
--- a/drivers/usb/serial/keyspan.h
+++ b/drivers/usb/serial/keyspan.h
@@ -520,11 +520,11 @@ static struct usb_device_id keyspan_ids_combined[] = {
 MODULE_DEVICE_TABLE(usb, keyspan_ids_combined);
 
 static struct usb_driver keyspan_driver = {
-       .owner =        THIS_MODULE,
        .name =         "keyspan",                
        .probe =        usb_serial_probe,
        .disconnect =   usb_serial_disconnect,
        .id_table =     keyspan_ids_combined,
+       .no_dynamic_id =        1,
 };
 
 /* usb_device_id table for the pre-firmware download keyspan devices */
@@ -570,10 +570,12 @@ static struct usb_device_id keyspan_4port_ids[] = {
 };
 
 /* Structs for the devices, pre and post renumeration. */
-static struct usb_serial_device_type keyspan_pre_device = {
-       .owner                  = THIS_MODULE,
-       .name                   = "Keyspan - (without firmware)",
-       .short_name             = "keyspan_no_firm",
+static struct usb_serial_driver keyspan_pre_device = {
+       .driver = {
+               .owner          = THIS_MODULE,
+               .name           = "keyspan_no_firm",
+       },
+       .description            = "Keyspan - (without firmware)",
        .id_table               = keyspan_pre_ids,
        .num_interrupt_in       = NUM_DONT_CARE,
        .num_bulk_in            = NUM_DONT_CARE,
@@ -582,10 +584,12 @@ static struct usb_serial_device_type keyspan_pre_device = {
        .attach                 = keyspan_fake_startup,
 };
 
-static struct usb_serial_device_type keyspan_1port_device = {
-       .owner                  = THIS_MODULE,
-       .name                   = "Keyspan 1 port adapter",
-       .short_name             = "keyspan_1",
+static struct usb_serial_driver keyspan_1port_device = {
+       .driver = {
+               .owner          = THIS_MODULE,
+               .name           = "keyspan_1",
+       },
+       .description            = "Keyspan 1 port adapter",
        .id_table               = keyspan_1port_ids,
        .num_interrupt_in       = NUM_DONT_CARE,
        .num_bulk_in            = NUM_DONT_CARE,
@@ -607,10 +611,12 @@ static struct usb_serial_device_type keyspan_1port_device = {
        .shutdown               = keyspan_shutdown,
 };
 
-static struct usb_serial_device_type keyspan_2port_device = {
-       .owner                  = THIS_MODULE,
-       .name                   = "Keyspan 2 port adapter",
-       .short_name             = "keyspan_2",
+static struct usb_serial_driver keyspan_2port_device = {
+       .driver = {
+               .owner          = THIS_MODULE,
+               .name           = "keyspan_2",
+       },
+       .description            = "Keyspan 2 port adapter",
        .id_table               = keyspan_2port_ids,
        .num_interrupt_in       = NUM_DONT_CARE,
        .num_bulk_in            = NUM_DONT_CARE,
@@ -632,10 +638,12 @@ static struct usb_serial_device_type keyspan_2port_device = {
        .shutdown               = keyspan_shutdown,
 };
 
-static struct usb_serial_device_type keyspan_4port_device = {
-       .owner                  = THIS_MODULE,
-       .name                   = "Keyspan 4 port adapter",
-       .short_name             = "keyspan_4",
+static struct usb_serial_driver keyspan_4port_device = {
+       .driver = {
+               .owner          = THIS_MODULE,
+               .name           = "keyspan_4",
+       },
+       .description            = "Keyspan 4 port adapter",
        .id_table               = keyspan_4port_ids,
        .num_interrupt_in       = NUM_DONT_CARE,
        .num_bulk_in            = 5,