All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Davies <jjd27@cam.ac.uk>
To: greg@kroah.com
Cc: linux-kernel@vger.kernel.org, jjd27@cam.ac.uk
Subject: Re: [PATCH] ftdi_sio driver - new PIDs
Date: Wed, 9 Aug 2006 10:48:03 +0100	[thread overview]
Message-ID: <20060809094803.GA22922@cam.ac.uk> (raw)


Greg KH wrote:
> On Mon, Aug 07, 2006 at 02:44:15PM +0100, Jonathan Davies wrote:
>>> Your patch is line-wrapped and the tabs are eaten, making it hard to
>>> apply the patch :(
>> Sorry; I'll try again with a different mail client!
> 
> Closer, the tabs are now fine, but the patch is line-wrapped, and you
> are using a mime email, which means I can't directly apply the patch...

Time to try a third mail client.

> Care to try again, third time's the charm :)

Here we go again:

Signed-off-by: Jonathan Davies <jjd27@cam.ac.uk>

diff -uprN -X linux-2.6.18-rc3-vanilla/Documentation/dontdiff linux-2.6.18-rc3-vanilla/drivers/usb/serial/ftdi_sio.c linux-2.6.18-rc3/drivers/usb/serial/ftdi_sio.c
--- linux-2.6.18-rc3-vanilla/drivers/usb/serial/ftdi_sio.c	2006-07-30 07:15:36.000000000 +0100
+++ linux-2.6.18-rc3/drivers/usb/serial/ftdi_sio.c	2006-08-07 11:33:15.000000000 +0100
@@ -306,6 +306,8 @@ static struct ftdi_sio_quirk ftdi_HE_TIR
 
 
 static struct usb_device_id id_table_combined [] = {
+	{ USB_DEVICE(FTDI_VID, FTDI_AMC232_PID) },
+	{ USB_DEVICE(FTDI_VID, FTDI_CANUSB_PID) },
 	{ USB_DEVICE(FTDI_VID, FTDI_ACTZWAVE_PID) },
 	{ USB_DEVICE(FTDI_VID, FTDI_IRTRANS_PID) },
 	{ USB_DEVICE(FTDI_VID, FTDI_IPLUS_PID) },
diff -uprN -X linux-2.6.18-rc3-vanilla/Documentation/dontdiff linux-2.6.18-rc3-vanilla/drivers/usb/serial/ftdi_sio.h linux-2.6.18-rc3/drivers/usb/serial/ftdi_sio.h
--- linux-2.6.18-rc3-vanilla/drivers/usb/serial/ftdi_sio.h	2006-07-30 07:15:36.000000000 +0100
+++ linux-2.6.18-rc3/drivers/usb/serial/ftdi_sio.h	2006-08-09 10:34:50.000000000 +0100
@@ -32,6 +32,12 @@
 #define FTDI_NF_RIC_PID	0x0001	/* Product Id */
 
 
+/* www.canusb.com Lawicel CANUSB device */
+#define FTDI_CANUSB_PID 0xFFA8 /* Product Id */
+
+/* AlphaMicro Components AMC-232USB01 device */
+#define FTDI_AMC232_PID 0xFF00 /* Product Id */
+
 /* ACT Solutions HomePro ZWave interface (http://www.act-solutions.com/HomePro.htm) */
 #define FTDI_ACTZWAVE_PID	0xF2D0
 

             reply	other threads:[~2006-08-09  9:48 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-08-09  9:48 Jonathan Davies [this message]
  -- strict thread matches above, loose matches on Subject: below --
2006-08-04 14:34 [PATCH] ftdi_sio driver - new PIDs Jonathan Davies
2006-08-04 17:23 ` Greg KH
2006-08-07 13:44   ` Jonathan Davies
2006-08-07 18:32     ` 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=20060809094803.GA22922@cam.ac.uk \
    --to=jjd27@cam.ac.uk \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.