From owner-svn-src-stable-8@FreeBSD.ORG  Tue Apr  6 23:30:02 2010
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AECDC106564A;
	Tue,  6 Apr 2010 23:30:02 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 966C78FC13;
	Tue,  6 Apr 2010 23:30:02 +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 o36NU2Hd015185;
	Tue, 6 Apr 2010 23:30:02 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o36NU2gM015182;
	Tue, 6 Apr 2010 23:30:02 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <201004062330.o36NU2gM015182@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Tue, 6 Apr 2010 23:30:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206323 - stable/8/sys/dev/usb/controller
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Apr 2010 23:30:02 -0000

Author: thompsa
Date: Tue Apr  6 23:30:02 2010
New Revision: 206323
URL: http://svn.freebsd.org/changeset/base/206323

Log:
  MFC r205802
  
   Add PCI IDs for two more nForce controllers.
  
  Submitted by:	Dmitry Luhtionov @ gmail.com

Modified:
  stable/8/sys/dev/usb/controller/ehci_pci.c
  stable/8/sys/dev/usb/controller/ohci_pci.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/usb/controller/ehci_pci.c
==============================================================================
--- stable/8/sys/dev/usb/controller/ehci_pci.c	Tue Apr  6 23:29:38 2010	(r206322)
+++ stable/8/sys/dev/usb/controller/ehci_pci.c	Tue Apr  6 23:30:02 2010	(r206323)
@@ -215,6 +215,8 @@ ehci_pci_match(device_t self)
 		return "NVIDIA nForce3 250 USB 2.0 controller";
 	case 0x005b10de:
 		return "NVIDIA nForce4 USB 2.0 controller";
+	case 0x036d10de:
+		return "NVIDIA nForce MCP55 USB 2.0 controller";
 	case 0x03f210de:
 		return "NVIDIA nForce MCP61 USB 2.0 controller";
 	case 0x0aa610de:

Modified: stable/8/sys/dev/usb/controller/ohci_pci.c
==============================================================================
--- stable/8/sys/dev/usb/controller/ohci_pci.c	Tue Apr  6 23:29:38 2010	(r206322)
+++ stable/8/sys/dev/usb/controller/ohci_pci.c	Tue Apr  6 23:30:02 2010	(r206323)
@@ -173,6 +173,8 @@ ohci_pci_match(device_t self)
 	case 0x00d710de:
 		return ("nVidia nForce3 USB Controller");
 
+	case 0x036c10de:
+		return ("nVidia nForce MCP55 USB Controller");
 	case 0x03f110de:
 		return ("nVidia nForce MCP61 USB Controller");
 	case 0x0aa510de: