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.358.2.3
retrieving revision 1.359
diff -u -p -r1.358.2.3 -r1.359
--- src/sys/arch/macppc/conf/GENERIC	2020/02/29 20:18:26	1.358.2.3
+++ src/sys/arch/macppc/conf/GENERIC	2020/01/08 14:21:12	1.359
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.358.2.3 2020/02/29 20:18:26 ad Exp $
+# $NetBSD: GENERIC,v 1.359 2020/01/08 14:21:12 macallan 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.358.2.3 $"
+#ident 		"GENERIC-$Revision: 1.359 $"
 
 maxusers	32
 
@@ -203,10 +203,12 @@ bwi*	at pci? dev ? function ?	# Broadcom
 ep*	at pci? dev ? function ?	# 3Com 3c59x
 epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
 ex*	at pci? dev ? function ?	# 3Com 90x[BC]
+fpa*	at pci? dev ? function ?	# DEC PCI FDDI (DEFPA) Controller
 fxp*	at pci? dev ? function ?	# Intel EtherExpress PRO 10+/100B
 gem*	at pci? dev ? function ?	# gmac ethernet
 #gm*	at pci? dev ? function ?	# gmac ethernet (old)
 gsip*	at pci? dev ? function ?	# NS83820 Gigabit Ethernet
+le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
 mtd*	at pci? dev ? function ?	# Myson MTD803 3-in-1 Ethernet
 ne*	at pci? dev ? function ?	# NE2000-compatible Ethernet
 pcn*	at pci? dev ? function ?	# AMD PCnet-PCI Ethernet
@@ -328,9 +330,6 @@ mc*	at obio?			# MACE ethernet
 esp*	at obio? flags 0x00ff		# 53c9x SCSI
 mesh*	at obio? flags 0xffff		# MESH SCSI
 nvram*	at obio?			# nvram
-options OBIO_SPEED_CONTROL		# CPU speed / voltage control via GPIOs
-					# and/or DFS, found on most *Book G4
-
 
 # the traditional ADB subsystem
 
@@ -376,7 +375,6 @@ lmtemp* 	at iic?		# temperature sensor, 
 deq* 		at iic?		# mixer/equalizer, used by snapper
 admtemp* 	at iic?		# temperature sensor found in Mini, G5
 psoc* 		at iic?		# fan controller found in TiBooks
-lmu* 		at iic?		# ambient / keyboard lights
 videopll*	at iic?		# for valkyriefb
 sgsmix* 	at iic?		# Additional mixer found in beige G3
 				# use with awacs.
@@ -445,8 +443,7 @@ usb*	at slhci?					# USB bus support
 
 include "dev/usb/usbdevices.config"
 
-uatp*	at uhidev? reportid ?	# Apple multi-touchpads found in late *Books
-#pbms*	at uhidev? reportid ?	# older driver for touchpads
+pbms*	at uhidev? reportid ?				# PowerBook 15" mouse
 
 # Bluetooth Controller and Device support