| Message ID | 1249643870-13276-1-git-send-email-w.sang@pengutronix.de |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
From: Wolfram Sang <w.sang@pengutronix.de> Date: Fri, 7 Aug 2009 13:17:50 +0200 > Fixes this report: > http://article.gmane.org/gmane.linux.kernel.pcmcia.devel/2228/ > > Reported-by: John McGrath <john@john-mcgrath.com> > Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Applied, thank you. -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Aug 14, 2009 at 01:09:38PM -0700, David Miller wrote: > From: Wolfram Sang <w.sang@pengutronix.de> > Date: Fri, 7 Aug 2009 13:17:50 +0200 > > > Fixes this report: > > http://article.gmane.org/gmane.linux.kernel.pcmcia.devel/2228/ > > > > Reported-by: John McGrath <john@john-mcgrath.com> > > Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> > > Applied, thank you. I just noticed that it is not in rc9. Is it possible to get it into .31? Otherwise the ide and pata driver would diverge for this kernel version. Rgeards, Wolfram
From: Wolfram Sang <w.sang@pengutronix.de> Date: Sun, 6 Sep 2009 17:33:00 +0200 > On Fri, Aug 14, 2009 at 01:09:38PM -0700, David Miller wrote: >> From: Wolfram Sang <w.sang@pengutronix.de> >> Date: Fri, 7 Aug 2009 13:17:50 +0200 >> >> > Fixes this report: >> > http://article.gmane.org/gmane.linux.kernel.pcmcia.devel/2228/ >> > >> > Reported-by: John McGrath <john@john-mcgrath.com> >> > Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> >> >> Applied, thank you. > > I just noticed that it is not in rc9. Is it possible to get it into .31? Sure, just forgot to push it out. -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c index 527908f..063b933 100644 --- a/drivers/ide/ide-cs.c +++ b/drivers/ide/ide-cs.c @@ -408,6 +408,7 @@ static struct pcmcia_device_id ide_ids[] = { PCMCIA_DEVICE_PROD_ID123("PCMCIA", "IDE CARD", "F1", 0x281f1c5d, 0x1907960c, 0xf7fde8b9), PCMCIA_DEVICE_PROD_ID12("ARGOSY", "CD-ROM", 0x78f308dc, 0x66536591), PCMCIA_DEVICE_PROD_ID12("ARGOSY", "PnPIDE", 0x78f308dc, 0x0c694728), + PCMCIA_DEVICE_PROD_ID12("CNF ", "CD-ROM", 0x46d7db81, 0x66536591), PCMCIA_DEVICE_PROD_ID12("CNF CD-M", "CD-ROM", 0x7d93b852, 0x66536591), PCMCIA_DEVICE_PROD_ID12("Creative Technology Ltd.", "PCMCIA CD-ROM Interface Card", 0xff8c8a45, 0xfe8020c4), PCMCIA_DEVICE_PROD_ID12("Digital Equipment Corporation.", "Digital Mobile Media CD-ROM", 0x17692a66, 0xef1dcbde),
Fixes this report: http://article.gmane.org/gmane.linux.kernel.pcmcia.devel/2228/ Reported-by: John McGrath <john@john-mcgrath.com> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> --- drivers/ide/ide-cs.c | 1 + 1 file changed, 1 insertion(+), 0 deletions(-)