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.279
retrieving revision 1.279.2.1
diff -u -p -r1.279 -r1.279.2.1
--- src/sys/arch/macppc/conf/GENERIC	2010/03/07 09:39:43	1.279
+++ src/sys/arch/macppc/conf/GENERIC	2010/05/30 05:16:57	1.279.2.1
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.279 2010/03/07 09:39:43 plunky Exp $
+# $NetBSD: GENERIC,v 1.279.2.1 2010/05/30 05:16:57 rmind 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.279 $"
+#ident 		"GENERIC-$Revision: 1.279.2.1 $"
 
 maxusers	32
 
@@ -141,6 +141,7 @@ options 	PPP_FILTER	# Active filter supp
 options 	PFIL_HOOKS	# pfil(9) packet filter hooks
 options 	IPFILTER_LOG	# ipmon(8) log support
 options 	IPFILTER_LOOKUP	# ippool(8) support
+options 	IPFILTER_COMPAT # Compat for IP-Filter
 #options 	IPFILTER_DEFAULT_BLOCK	# block all packets by default
 #options 	TCP_DEBUG	# Record last TCP_NDEBUG packets with SO_DEBUG
 
@@ -266,6 +267,7 @@ bha*	at pci? dev ? function ?	# BusLogic
 esiop*	at pci? dev ? function ?	# NCR 53c8xx SCSI (enhanced)
 iha*	at pci? dev ? function ?	# Initio INIC-940/950 SCSI
 isp*	at pci? dev ? function ?	# Qlogic ISP 10x0/2xx0 SCSI/Fibre Chan
+mpt*	at pci? dev ? function ?	# LSILogic 9x9 and 53c1030
 pcscp*	at pci? dev ? function ?	# AMD Am53c974 PCscsi-PCI SCSI
 siop*	at pci? dev ? function ?	# NCR 53c8xx SCSI
 trm*	at pci? dev ? function ?	# Tekram DC-395U/UW/F, DC-315/U SCSI
@@ -570,7 +572,7 @@ options 	RAID_AUTOCONFIG		# auto-configu
 # options 	RF_INCLUDE_INTERDECLUSTER=1
 # options 	RF_INCLUDE_PARITY_DECLUSTERING=1
 # options 	RF_INCLUDE_PARITY_DECLUSTERING_DS=1
-pseudo-device	fss		4	# file system snapshot device
+pseudo-device	fss			# file system snapshot device
 pseudo-device	md		1	# memory disk device
 pseudo-device	loop			# network loopback
 pseudo-device	bpfilter		# packet filter