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.351
retrieving revision 1.352
diff -u -p -r1.351 -r1.352
--- src/sys/arch/amd64/conf/GENERIC	2012/03/25 00:11:16	1.351
+++ src/sys/arch/amd64/conf/GENERIC	2012/04/07 05:39:55	1.352
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.351 2012/03/25 00:11:16 nonaka Exp $
+# $NetBSD: GENERIC,v 1.352 2012/04/07 05:39:55 christos 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.351 $"
+#ident 		"GENERIC-$Revision: 1.352 $"
 
 maxusers	64		# estimated number of users
 
@@ -127,9 +127,11 @@ options 	COMPAT_BSDPTY	# /dev/[pt]ty?? p
 # Wedge support
 options 	DKWEDGE_AUTODISCOVER	# Automatically add dk(4) instances
 options 	DKWEDGE_METHOD_GPT	# Supports GPT partitions as wedges
-# The following two options can break /etc/fstab, so handle with care
+# The following three options can break /etc/fstab, so handle with care
 #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
+
 
 file-system 	FFS		# UFS
 file-system	MFS		# memory file system
@@ -1197,7 +1199,7 @@ pseudo-device	gif			# IPv[46] over IPv[4
 pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging
-#options 	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
+options 	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
 pseudo-device	agr			# IEEE 802.3ad link aggregation
 
 #