From patchwork Fri Aug 7 11:17:50 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 30922 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by bilbo.ozlabs.org (Postfix) with ESMTP id 47E20B70BA for ; Fri, 7 Aug 2009 21:17:55 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755812AbZHGLRv (ORCPT ); Fri, 7 Aug 2009 07:17:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757025AbZHGLRv (ORCPT ); Fri, 7 Aug 2009 07:17:51 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:33493 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755812AbZHGLRu (ORCPT ); Fri, 7 Aug 2009 07:17:50 -0400 Received: from [2001:6f8:1178:2:221:70ff:fe71:1890] (helo=pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.63) (envelope-from ) id 1MZNSI-00049p-Sq; Fri, 07 Aug 2009 13:17:50 +0200 From: Wolfram Sang To: linux-ide@vger.kernel.org Cc: linux-pcmcia@lists.infradead.org, David Miller , Wolfram Sang Subject: [PATCH] pcmcia: add CNF-CDROM-ID for ide Date: Fri, 7 Aug 2009 13:17:50 +0200 Message-Id: <1249643870-13276-1-git-send-email-w.sang@pengutronix.de> X-Mailer: git-send-email 1.6.3.1 In-Reply-To: <20090806.132413.156910755.davem@davemloft.net> References: <20090806.132413.156910755.davem@davemloft.net> X-SA-Exim-Connect-IP: 2001:6f8:1178:2:221:70ff:fe71:1890 X-SA-Exim-Mail-From: w.sang@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-ide@vger.kernel.org Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org Fixes this report: http://article.gmane.org/gmane.linux.kernel.pcmcia.devel/2228/ Reported-by: John McGrath Signed-off-by: Wolfram Sang --- drivers/ide/ide-cs.c | 1 + 1 file changed, 1 insertion(+), 0 deletions(-) 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),