linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg KH <gregkh@suse.de>
To: Linus Torvalds <torvalds@osdl.org>, Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org,
	linux-usb-devel@lists.sourceforge.net, dhollis@davehollis.com
Subject: [patch 16/18] USB: Add Novatel CDMA Wireless PC card IDs to airprime
Date: Thu, 22 Sep 2005 00:49:39 -0700	[thread overview]
Message-ID: <20050922074939.GQ15053@kroah.com> (raw)
In-Reply-To: <20050922074643.GA15053@kroah.com>

[-- Attachment #1: usb-airprime-id.patch --]
[-- Type: text/plain, Size: 887 bytes --]

From: David Hollis <dhollis@davehollis.com>


USB: Add device id's for Novatel Wireless CDMA wireless PC card.
     The Novatel CDMA card behaves the same as the AirPrime by providing
     a USB serial port.

Signed-off-by: David Hollis <dhollis@davehollis.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 drivers/usb/serial/airprime.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- scsi-2.6.orig/drivers/usb/serial/airprime.c	2005-09-20 06:00:04.000000000 -0700
+++ scsi-2.6/drivers/usb/serial/airprime.c	2005-09-21 17:29:52.000000000 -0700
@@ -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);

--

  parent reply	other threads:[~2005-09-22  7:51 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20050922003901.814147000@echidna.kroah.org>
2005-09-22  7:46 ` [patch 00/18] USB and PCI Fixes for 2.6.14-rc2 Greg KH
2005-09-22  7:47   ` [patch 01/18] Driver Core: fis bus rescan devices race Greg KH
2005-09-22  7:47   ` [patch 02/18] Driver Core: add helper device_is_registered() Greg KH
2005-09-22  7:47   ` [patch 03/18] fix class symlinks in sysfs Greg KH
2005-09-22  7:47   ` [patch 04/18] I2C: remove me from the MAINTAINERS file for i2c Greg Kroah-Hartman
2005-09-22  7:48   ` [patch 05/18] PCI: remove unused "scratch" Greg KH
2005-09-22  7:48   ` [patch 06/18] PCI: convert kcalloc to kzalloc Greg KH
2005-09-22  7:48   ` [patch 07/18] fix drivers/pci/probe.c warning Greg KH
2005-09-22  7:48   ` [patch 08/18] PCI Hotplug: Fix buffer overrun in rpadlpar_sysfs.c Greg KH
2005-09-22  7:48   ` [patch 09/18] ub: fix burning cds Greg KH
2005-09-22  7:48   ` [patch 10/18] USB: more device IDs for Option card driver Greg KH
2005-09-22  7:48   ` [patch 11/18] USB: ftdi_sio: allow baud rate to be changed without raising RTS and DTR Greg KH
2005-09-22  7:48   ` [patch 12/18] USB: fix pxa2xx_udc compile warnings Greg KH
2005-09-22  7:49   ` [patch 13/18] USB: sl811-hcd minor fixes Greg KH
2005-09-22  7:49   ` [patch 14/18] USB: fix pegasus driver Greg KH
2005-09-22  7:49   ` [patch 15/18] usb/serial/option.c: Increase input buffer size Greg KH
2005-09-22  7:49   ` Greg KH [this message]
2005-09-22  7:49   ` [patch 17/18] ub: Comment out unconditional stall clear Greg KH
2005-09-22  7:49   ` [patch 18/18] USB: Update Documentation/usb/URB.txt Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20050922074939.GQ15053@kroah.com \
    --to=gregkh@suse.de \
    --cc=akpm@osdl.org \
    --cc=dhollis@davehollis.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb-devel@lists.sourceforge.net \
    --cc=torvalds@osdl.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).