linux-serial.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] serial/pcmcia: add ID for Advantech card
@ 2009-08-01 13:28 Wolfram Sang
  2009-08-01 17:15 ` Greg KH
  0 siblings, 1 reply; 2+ messages in thread
From: Wolfram Sang @ 2009-08-01 13:28 UTC (permalink / raw)
  To: linux-serial; +Cc: linux-pcmcia, KMoorman, Wolfram Sang, Greg KH

Add ID as reported in:

http://lists.infradead.org/pipermail/linux-pcmcia/2009-May/006127.html

Reported-by: Kenneth Moorman <KMoorman@transy.edu>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: Greg KH <gregkh@suse.de>
---

As this just adds an ID, it might be nice to have in 2.6.31 already. Greg, could
you pick it up perhaps? Otherwise I'll queue it up in my pcmcia-l2-branch which
Dominik hopefully pulls for 2.6.32.

 drivers/serial/serial_cs.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index 79c9c5f..6ecb51b 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -884,6 +884,7 @@ static struct pcmcia_device_id serial_ids[] = {
 	PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0xa555, "SW_555_SER.cis"),  /* Sierra Aircard 555 CDMA 1xrtt Modem -- pre update */
 	PCMCIA_DEVICE_CIS_MANF_CARD(0x013f, 0xa555, "SW_555_SER.cis"),  /* Sierra Aircard 555 CDMA 1xrtt Modem -- post update */
 	PCMCIA_DEVICE_CIS_PROD_ID12("MultiTech", "PCMCIA 56K DataFax", 0x842047ee, 0xc2efcf03, "MT5634ZLX.cis"),
+	PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-2", 0x96913a85, 0x27ab5437, "COMpad2.cis"),
 	PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-4", 0x96913a85, 0xcec8f102, "COMpad4.cis"),
 	PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "COMpad2.cis"),
 	PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "RS-COM-2P.cis"),
-- 
1.6.3.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] serial/pcmcia: add ID for Advantech card
  2009-08-01 13:28 [PATCH] serial/pcmcia: add ID for Advantech card Wolfram Sang
@ 2009-08-01 17:15 ` Greg KH
  0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2009-08-01 17:15 UTC (permalink / raw)
  To: Wolfram Sang; +Cc: linux-serial, linux-pcmcia, KMoorman

On Sat, Aug 01, 2009 at 03:28:35PM +0200, Wolfram Sang wrote:
> Add ID as reported in:
> 
> http://lists.infradead.org/pipermail/linux-pcmcia/2009-May/006127.html
> 
> Reported-by: Kenneth Moorman <KMoorman@transy.edu>
> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> Cc: Greg KH <gregkh@suse.de>
> ---
> 
> As this just adds an ID, it might be nice to have in 2.6.31 already. Greg, could
> you pick it up perhaps? Otherwise I'll queue it up in my pcmcia-l2-branch which
> Dominik hopefully pulls for 2.6.32.

I can queue it up for .31, if it missed it, I'll get it added to the
.31-stable tree.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-08-01 17:34 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-01 13:28 [PATCH] serial/pcmcia: add ID for Advantech card Wolfram Sang
2009-08-01 17:15 ` Greg KH

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).