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.320
retrieving revision 1.320.2.2
diff -u -p -r1.320 -r1.320.2.2
--- src/sys/arch/macppc/conf/GENERIC	2014/11/16 16:01:41	1.320
+++ src/sys/arch/macppc/conf/GENERIC	2016/05/29 08:44:18	1.320.2.2
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.320 2014/11/16 16:01:41 manu Exp $
+# $NetBSD: GENERIC,v 1.320.2.2 2016/05/29 08:44:18 skrll 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.320 $"
+#ident 		"GENERIC-$Revision: 1.320.2.2 $"
 
 maxusers	32
 
@@ -89,7 +89,7 @@ options         DKWEDGE_AUTODISCOVER    
 options         DKWEDGE_METHOD_GPT      # Supports GPT partitions as wedges
 #options		DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
 #options		DKWEDGE_METHOD_MBR      # Support MBR partitions as wedges
-options		DKWEDGE_METHOD_APPLE    # Support Apple partitions as wedges
+#options		DKWEDGE_METHOD_APPLE    # Support Apple partitions as wedges
 
 # File systems
 file-system 	FFS		# UFS
@@ -526,7 +526,7 @@ udav*	at uhub? port ?		# Davicom DM9601 
 ukyopon* at uhub? port ?				# Kyocera AIR-EDGE PHONE
 ucom*	at ukyopon? portno ?
 
-uscanner* at uhub? port ?				# USB scanners
+#uscanner* at uhub? port ?				# USB scanners
 uyap* at uhub? port ?					# Y@P firmware loader
 ugen*	at uhub? port ? configuration ? interface ?	# USB Generic driver