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/macppc/conf/GENERIC,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/macppc/conf/GENERIC,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -r1.195 -r1.196
--- src/sys/arch/macppc/conf/GENERIC	2005/04/15 17:27:21	1.195
+++ src/sys/arch/macppc/conf/GENERIC	2005/05/31 22:09:08	1.196
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.195 2005/04/15 17:27:21 itohy Exp $
+# $NetBSD: GENERIC,v 1.196 2005/05/31 22:09:08 tron Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/macppc/conf/std.macppc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.195 $"
+#ident 		"GENERIC-$Revision: 1.196 $"
 
 maxusers	32
 
@@ -358,18 +358,7 @@ wsmouse* at ams?
 #ubsec*	at pci? dev ? function ?	# Broadcom 5501/5601/580x/582x
 
 
-scsibus* at adv?
-scsibus* at adw?
-scsibus* at ahc?
-scsibus* at bha?
-scsibus* at iha?
-scsibus* at isp?
-scsibus* at esp?
-scsibus* at mesh?
-scsibus* at pcscp?
-scsibus* at siop?
-scsibus* at esiop?
-scsibus* at trm?
+scsibus* at scsi?
 
 sd*	at scsibus? target ? lun ?	# SCSI disks
 st*	at scsibus? target ? lun ?	# SCSI tape drives