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/sparc64/conf/GENERIC,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/sparc64/conf/GENERIC,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.87
retrieving revision 1.87.4.2
diff -u -p -r1.87 -r1.87.4.2
--- src/sys/arch/sparc64/conf/GENERIC	2007/06/11 13:39:22	1.87
+++ src/sys/arch/sparc64/conf/GENERIC	2007/09/03 10:19:35	1.87.4.2
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.87 2007/06/11 13:39:22 kiyohara Exp $
+# $NetBSD: GENERIC,v 1.87.4.2 2007/09/03 10:19:35 skrll Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include	"arch/sparc64/conf/std.sparc64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.87 $"
+#ident 		"GENERIC-$Revision: 1.87.4.2 $"
 
 maxusers	64
 
@@ -200,8 +200,8 @@ options 	INET6		# IPV6
 options 	MROUTING	# packet forwarding of multicast packets
 options 	PIM		# Protocol Independent Multicast
 #options 	DIRECTED_BROADCAST	# allow broadcasts through routers
-options 	ISO,TPIP	# OSI networking
-options 	EON		# OSI tunneling over IP
+#options 	ISO,TPIP	# OSI networking
+#options 	EON		# OSI tunneling over IP
 options 	NETATALK	# AppleTalk (over Ethernet) protocol
 options 	NTP		# Network Time Protocol in-kernel support
 #options 	PPS_SYNC	# Add serial line synchronization for NTP
@@ -535,6 +535,9 @@ ehci*	at pci? dev ? function ?	# Enhance
 ohci*	at pci? dev ? function ?	# Open Host Controller
 uhci*	at pci?	dev ? function ?	# Universal Host Controller (Intel)
 
+# PCMCIA USB controllers
+#slhci*	at pcmcia? function ?		# ScanLogic SL811HS
+
 # USB bus support
 usb*	at ehci?
 usb*	at ohci?
@@ -783,12 +786,14 @@ pseudo-device	stf			# 6to4 IPv6 over IPv
 
 ## Bluetooth PCMCIA Controllers
 #bt3c* at pcmcia? function ?		# 3Com 3CRWB6096-A
+#btbc* at pcmcia? function ?		# AnyCom BlueCard LSE041/039/139
 
 ## Bluetooth USB Controllers
 ubt* at uhub? port ?
 
 ## Bluetooth Device Hub
 #bthub* at bt3c?
+#bthub* at btbc?
 #bthub* at btuart?
 bthub* at ubt?