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/sparc64/conf/GENERIC,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/sparc64/conf/GENERIC,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.52.16.1
retrieving revision 1.53
diff -u -p -r1.52.16.1 -r1.53
--- src/sys/arch/sparc64/conf/GENERIC	2006/07/13 17:49:04	1.52.16.1
+++ src/sys/arch/sparc64/conf/GENERIC	2006/06/30 10:27:48	1.53
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.52.16.1 2006/07/13 17:49:04 gdamore Exp $
+# $NetBSD: GENERIC,v 1.53 2006/06/30 10:27:48 tsutsui Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include	"arch/sparc64/conf/std.sparc64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.52.16.1 $"
+#ident 		"GENERIC-$Revision: 1.53 $"
 
 maxusers	64
 
@@ -784,7 +784,7 @@ autri*		at pci? dev ? function ?	# Blade
 
 audio*		at audiobus?
 
-midi*		at midibus?
+#midi*		at midibus?
 
 
 ## Sun "bwtwo" black and white framebuffer, found on sun4, sun4c, and sun4m
@@ -830,8 +830,6 @@ options 	FONT_GALLANT12x22		# PROM font 
 
 #### Other device configuration
 
-psm*		at ebus?		# Ultrabook IIi microcontroller
-
 ### Other pseudo-devices
 
 pseudo-device 	crypto			# /dev/crypto device