Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/amd64/conf/GENERIC,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/amd64/conf/GENERIC,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.303
retrieving revision 1.304
diff -u -p -r1.303 -r1.304
--- src/sys/arch/amd64/conf/GENERIC	2011/02/13 04:21:23	1.303
+++ src/sys/arch/amd64/conf/GENERIC	2011/02/14 08:50:39	1.304
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.303 2011/02/13 04:21:23 jym Exp $
+# $NetBSD: GENERIC,v 1.304 2011/02/14 08:50:39 hannken Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.303 $"
+#ident 		"GENERIC-$Revision: 1.304 $"
 
 maxusers	64		# estimated number of users
 
@@ -428,6 +428,9 @@ amdtemp* at pci? dev ? function ?	# AMD 
 #wbsio*	at isa? port 0x2e
 #wbsio*	at isa? port 0x4e
 
+# IBM Hawk Integrated Systems Management Processor
+#ibmhawk0	at iic? addr 0x37
+
 # LM7[89] and compatible hardware monitors
 # Use flags to select temp sensor type (see lm(4) man page for details)
 #lm0	at isa?	port 0x290 flags 0x0	# other common ports: 0x280, 0x310