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/alpha/conf/GENERIC,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/alpha/conf/GENERIC,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.310.2.2
retrieving revision 1.311
diff -u -p -r1.310.2.2 -r1.311
--- src/sys/arch/alpha/conf/GENERIC	2007/03/24 14:54:31	1.310.2.2
+++ src/sys/arch/alpha/conf/GENERIC	2007/03/01 14:57:38	1.311
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.310.2.2 2007/03/24 14:54:31 yamt Exp $
+# $NetBSD: GENERIC,v 1.311 2007/03/01 14:57:38 kiyohara Exp $
 #
 # This machine description file is used to generate the default NetBSD
 # kernel.
@@ -19,7 +19,7 @@ include 	"arch/alpha/conf/std.alpha"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident		"GENERIC-$Revision: 1.310.2.2 $"
+ident		"GENERIC-$Revision: 1.311 $"
 
 maxusers 32
 
@@ -542,7 +542,7 @@ usb*	at ehci?
 
 # USB Hubs
 uhub*	at usb?
-uhub*	at uhub? port ?
+uhub*	at uhub? port ? configuration ? interface ?
 
 # USB HID device
 uhidev*	at uhub? port ? configuration ? interface ?
@@ -631,7 +631,7 @@ ugen*	at uhub? port ?
 bt3c* at pcmcia? function ?		# 3Com 3CRWB6096-A
 
 # Bluetooth USB Controllers
-ubt* at uhub? port ?
+ubt* at uhub? port ? configuration ? interface ?
 
 # Bluetooth Device Hub
 bthub* at bt3c?