From owner-svn-src-stable-7@FreeBSD.ORG  Tue Feb 23 01:24:02 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 0C0011065672;
	Tue, 23 Feb 2010 01:24:02 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EEDEE8FC08;
	Tue, 23 Feb 2010 01:24:01 +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 o1N1O1C6016241;
	Tue, 23 Feb 2010 01:24:01 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1N1O1fS016238;
	Tue, 23 Feb 2010 01:24:01 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201002230124.o1N1O1fS016238@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 23 Feb 2010 01:24:01 +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: r204240 - 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: Tue, 23 Feb 2010 01:24:02 -0000

Author: emaste
Date: Tue Feb 23 01:24:01 2010
New Revision: 204240
URL: http://svn.freebsd.org/changeset/base/204240

Log:
  MFC r202812:
  
    Add H55 ID from Mike Tancsa, with minor rewording from avg@.
  
  PR:		kern/143068
  Submitted by:	Mike Tancsa (Sentex)

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	Tue Feb 23 01:08:03 2010	(r204239)
+++ stable/7/sys/dev/ichwd/ichwd.c	Tue Feb 23 01:24:01 2010	(r204240)
@@ -109,6 +109,7 @@ static struct ichwd_device ichwd_devices
 	{ DEVICEID_ICH10D,   "Intel ICH10D watchdog timer",	10 },
 	{ DEVICEID_ICH10DO,  "Intel ICH10DO watchdog timer",	10 },
 	{ DEVICEID_ICH10R,   "Intel ICH10R watchdog timer",	10 },
+	{ DEVICEID_H55,      "Intel H55 watchdog timer",	10 },
 	{ 0, NULL, 0 },
 };
 

Modified: stable/7/sys/dev/ichwd/ichwd.h
==============================================================================
--- stable/7/sys/dev/ichwd/ichwd.h	Tue Feb 23 01:08:03 2010	(r204239)
+++ stable/7/sys/dev/ichwd/ichwd.h	Tue Feb 23 01:24:01 2010	(r204240)
@@ -99,6 +99,7 @@ struct ichwd_softc {
 #define DEVICEID_ICH10D		0x3a1a
 #define DEVICEID_ICH10DO	0x3a14
 #define DEVICEID_ICH10R		0x3a16
+#define DEVICEID_H55		0x3b06
 
 /* ICH LPC Interface Bridge Registers (ICH5 and older) */
 #define ICH_GEN_STA		0xd4