From owner-p4-projects@FreeBSD.ORG  Thu Jan 11 21:48:51 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AD4BC16A412; Thu, 11 Jan 2007 21:48:51 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7378216A417
	for <perforce@freebsd.org>; Thu, 11 Jan 2007 21:48:51 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 4B2C013C46B
	for <perforce@freebsd.org>; Thu, 11 Jan 2007 21:48:51 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0BLmooo075642
	for <perforce@freebsd.org>; Thu, 11 Jan 2007 21:48:50 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0BLmoQl075639
	for perforce@freebsd.org; Thu, 11 Jan 2007 21:48:50 GMT
	(envelope-from jhb@freebsd.org)
Date: Thu, 11 Jan 2007 21:48:50 GMT
Message-Id: <200701112148.l0BLmoQl075639@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 112800 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Jan 2007 21:48:51 -0000

http://perforce.freebsd.org/chv.cgi?CH=112800

Change 112800 by jhb@jhb_mutex on 2007/01/11 21:48:40

	IFC @112798.

Affected files ...

.. //depot/projects/smpng/sys/dev/ichsmb/ichsmb_pci.c#14 integrate

Differences ...

==== //depot/projects/smpng/sys/dev/ichsmb/ichsmb_pci.c#14 (text+ko) ====

@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ichsmb/ichsmb_pci.c,v 1.18 2007/01/11 19:56:24 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ichsmb/ichsmb_pci.c,v 1.19 2007/01/11 21:13:27 jhb Exp $");
 
 /*
  * Support for the SMBus controller logical device which is part of the
@@ -74,6 +74,7 @@
 #define ID_82801DC			0x24C38086
 #define ID_82801EB			0x24D38086
 #define ID_6300ESB			0x25a48086
+#define	ID_631xESB			0x269b8086
 
 #define PCIS_SERIALBUS_SMBUS_PROGIF	0x00
 
@@ -146,6 +147,9 @@
 	case ID_6300ESB:
 		device_set_desc(dev, "Intel 6300ESB (ICH) SMBus controller");
 		break;
+	case ID_631xESB:
+		device_set_desc(dev, "Intel 631xESB/6321ESB (ESB2) SMBus controller");
+		break;
 	default:
 		if (pci_get_class(dev) == PCIC_SERIALBUS
 		    && pci_get_subclass(dev) == PCIS_SERIALBUS_SMBUS