Merge ../linux-2.6 by hand

1 files changed, 6 insertions, 9 deletions

diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index 2ef614d5c8f2..35820bda7ae1 100644
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -1468,16 +1468,13 @@ static void garmin_shutdown (struct usb_serial *serial)
 }
 
 
-
-
-
-
-
 /* All of the device info needed */
-static struct usb_serial_device_type garmin_device = {
-        .owner               = THIS_MODULE,
-        .name                = "Garmin GPS usb/tty",
-        .short_name          = "garmin_gps",
+static struct usb_serial_driver garmin_device = {
+        .driver = {
+                .owner =        THIS_MODULE,
+                .name =         "garmin_gps",
+        },
+        .description =          "Garmin GPS usb/tty",
         .id_table            = id_table,
         .num_interrupt_in    = 1,
         .num_bulk_in         = 1,