From owner-svn-src-stable-7@FreeBSD.ORG  Mon Jul 12 17:50:39 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 58B711065670;
	Mon, 12 Jul 2010 17:50:39 +0000 (UTC)
	(envelope-from remko@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 47B678FC1C;
	Mon, 12 Jul 2010 17:50:39 +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 o6CHodUF068249;
	Mon, 12 Jul 2010 17:50:39 GMT (envelope-from remko@svn.freebsd.org)
Received: (from remko@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6CHodiT068246;
	Mon, 12 Jul 2010 17:50:39 GMT (envelope-from remko@svn.freebsd.org)
Message-Id: <201007121750.o6CHodiT068246@svn.freebsd.org>
From: Remko Lodder <remko@FreeBSD.org>
Date: Mon, 12 Jul 2010 17:50:39 +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: r209953 - stable/7/sys/dev/ichwd
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: Mon, 12 Jul 2010 17:50:39 -0000

Author: remko
Date: Mon Jul 12 17:50:38 2010
New Revision: 209953
URL: http://svn.freebsd.org/changeset/base/209953

Log:
  MFC r202917
  
   Add support for the NM10 chipset.
  
   PR:		kern/143118
   Submitted by:	Koshin sumitani <ksumitani at mui dot biglobe dot ne dot jp>
   Approved by:	imp (mentor, implicit)
   MFC after:	3 days

Modified:
  stable/7/sys/dev/ichwd/ichwd.c
  stable/7/sys/dev/ichwd/ichwd.h
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/ichwd/ichwd.c
==============================================================================
--- stable/7/sys/dev/ichwd/ichwd.c	Mon Jul 12 17:46:19 2010	(r209952)
+++ stable/7/sys/dev/ichwd/ichwd.c	Mon Jul 12 17:50:38 2010	(r209953)
@@ -93,6 +93,7 @@ static struct ichwd_device ichwd_devices
 	{ DEVICEID_ICH7DH,   "Intel ICH7DH watchdog timer",	7 },
 	{ DEVICEID_ICH7M,    "Intel ICH7M watchdog timer",	7 },
 	{ DEVICEID_ICH7MDH,  "Intel ICH7MDH watchdog timer",	7 },
+	{ DEVICEID_NM10,     "Intel NM10 watchdog timer",	7 },
 	{ DEVICEID_ICH8,     "Intel ICH8 watchdog timer",	8 },
 	{ DEVICEID_ICH8DH,   "Intel ICH8DH watchdog timer",	8 },
 	{ DEVICEID_ICH8DO,   "Intel ICH8DO watchdog timer",	8 },

Modified: stable/7/sys/dev/ichwd/ichwd.h
==============================================================================
--- stable/7/sys/dev/ichwd/ichwd.h	Mon Jul 12 17:46:19 2010	(r209952)
+++ stable/7/sys/dev/ichwd/ichwd.h	Mon Jul 12 17:50:38 2010	(r209953)
@@ -83,6 +83,7 @@ struct ichwd_softc {
 #define DEVICEID_ICH7		0x27b8
 #define DEVICEID_ICH7DH		0x27b0
 #define DEVICEID_ICH7M		0x27b9
+#define DEVICEID_NM10		0x27bc
 #define DEVICEID_ICH7MDH	0x27bd
 #define DEVICEID_ICH8		0x2810
 #define DEVICEID_ICH8DH		0x2812