From owner-svn-src-stable-7@FreeBSD.ORG  Fri Sep 24 19:18:03 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DD580106564A;
	Fri, 24 Sep 2010 19:18:03 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CC30B8FC21;
	Fri, 24 Sep 2010 19:18:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8OJI3lK036674;
	Fri, 24 Sep 2010 19:18:03 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8OJI3R5036672;
	Fri, 24 Sep 2010 19:18:03 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201009241918.o8OJI3R5036672@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Fri, 24 Sep 2010 19:18:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213125 - stable/7/sys/dev/ed
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Sep 2010 19:18:04 -0000

Author: yongari
Date: Fri Sep 24 19:18:03 2010
New Revision: 213125
URL: http://svn.freebsd.org/changeset/base/213125

Log:
  MFC r211764:
    Add PNP id for Compex RL2000.
    I'm not sure whether adding this logical id is correct or not
    because Compex RL2000 is in the list of supported hardware list.
    I guess the Compex RL2000 could be PCI variant while the controller
    in question is ISA controller. It seems PNP compat id didn't match
    or it had multiple compat ids so isa_pnp_probe() seemed to return
    ENOENT.
  
    PR:	kern/80853

Modified:
  stable/7/sys/dev/ed/if_ed_isa.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/ed/if_ed_isa.c
==============================================================================
--- stable/7/sys/dev/ed/if_ed_isa.c	Fri Sep 24 19:16:42 2010	(r213124)
+++ stable/7/sys/dev/ed/if_ed_isa.c	Fri Sep 24 19:18:03 2010	(r213125)
@@ -58,6 +58,7 @@ static struct isa_pnp_id ed_ids[] = {
 	{ 0x0131d805,	NULL },		/* ANX3101 */
 	{ 0x4cf48906,	NULL },		/* ATIf44c */
 	{ 0x01200507,	NULL },		/* AXE2001 */
+	{ 0x0115180e,	NULL },		/* CPX1501 */
 	{ 0x0090252a,	NULL },		/* JQE9000 */
 	{ 0x0020832e,	NULL },		/* KTC2000 */
 	{ 0xd680d041,	NULL },		/* PNP80d6 */