Pull release into acpica branch

1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/usb/serial/airprime.c b/drivers/usb/serial/airprime.c
index a4ce0008d69b..1f29d8837327 100644
--- a/drivers/usb/serial/airprime.c
+++ b/drivers/usb/serial/airprime.c
@@ -16,7 +16,8 @@
 #include "usb-serial.h"
 
 static struct usb_device_id id_table [] = {
-        { USB_DEVICE(0xf3d, 0x0112) },
+        { USB_DEVICE(0xf3d, 0x0112) },  /* AirPrime CDMA Wireless PC Card */
+        { USB_DEVICE(0x1410, 0x1110) }, /* Novatel Wireless Merlin CDMA */
         { },
 };
 MODULE_DEVICE_TABLE(usb, id_table);
@@ -29,9 +30,11 @@ static struct usb_driver airprime_driver = {
         .id_table =     id_table,
 };
 
-static struct usb_serial_device_type airprime_device = {
-        .owner =                THIS_MODULE,
-        .name =                 "airprime",
+static struct usb_serial_driver airprime_device = {
+        .driver = {
+                .owner =        THIS_MODULE,
+                .name =         "airprime",
+        },
         .id_table =             id_table,
         .num_interrupt_in =     NUM_DONT_CARE,
         .num_bulk_in =          NUM_DONT_CARE,