6 files changed, 42 insertions, 19 deletions

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 35f3a6896209a..7ea722faa51bc 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.155 1999/03/16 13:34:00 sos Exp $
+#	$Id: GENERIC,v 1.156 1999/03/29 17:56:27 ken Exp $
 
 machine		"i386"
 cpu		"I386_CPU"
@@ -225,7 +225,3 @@ options         SYSVMSG
 #device        umodem0
 #device        uhid0
 #device        ugen0
-
-#
-#options       USB_DEBUG
-#options       USBVERBOSE
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 9da9ba4fd88fd..67870f1e4c927 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.576 1999/04/09 21:14:56 nik Exp $
+#	$Id: LINT,v 1.577 1999/04/10 15:23:12 n_hibma Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -2125,5 +2125,13 @@ device        uhid0
 # Generic USB device driver
 device        ugen0
 #
+options       UHCI_DEBUG
+options       OHCI_DEBUG
 options       USB_DEBUG
-options       USBVERBOSE
+options       UHUB_DEBUG
+options       UMS_DEBUG
+options       UKBD_DEBUG
+options       UMASS_DEBUG
+options       UHID_DEBUG
+options       UGEN_DEBUG
+options       ULPT_DEBUG
diff --git a/sys/conf/options b/sys/conf/options
index 1458f2a648349..05d54b7259372 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-#	$Id: options,v 1.131 1999/04/08 17:58:07 n_hibma Exp $
+#	$Id: options,v 1.132 1999/04/09 16:28:11 des Exp $
 #
 #        On the handling of kernel options   
 # 
@@ -343,9 +343,16 @@ SIMOS			opt_simos.h
 BUS_DEBUG		opt_bus.h
 
 # options for USB support
+UHCI_DEBUG		opt_usb.h
+OHCI_DEBUG		opt_usb.h
 USB_DEBUG		opt_usb.h
-USBVERBOSE		opt_usb.h
-UMASS_DEBUG    opt_usb.h
+UGEN_DEBUG		opt_usb.h
+UHID_DEBUG		opt_usb.h
+UHUB_DEBUG		opt_usb.h
+UKBD_DEBUG		opt_usb.h
+ULPT_DEBUG		opt_usb.h
+UMASS_DEBUG		opt_usb.h
+UMS_DEBUG		opt_usb.h
 
 # Vinum options
 VINUMDEBUG		opt_vinum.h
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 35f3a6896209a..7ea722faa51bc 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.155 1999/03/16 13:34:00 sos Exp $
+#	$Id: GENERIC,v 1.156 1999/03/29 17:56:27 ken Exp $
 
 machine		"i386"
 cpu		"I386_CPU"
@@ -225,7 +225,3 @@ options         SYSVMSG
 #device        umodem0
 #device        uhid0
 #device        ugen0
-
-#
-#options       USB_DEBUG
-#options       USBVERBOSE
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 9da9ba4fd88fd..67870f1e4c927 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.576 1999/04/09 21:14:56 nik Exp $
+#	$Id: LINT,v 1.577 1999/04/10 15:23:12 n_hibma Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -2125,5 +2125,13 @@ device        uhid0
 # Generic USB device driver
 device        ugen0
 #
+options       UHCI_DEBUG
+options       OHCI_DEBUG
 options       USB_DEBUG
-options       USBVERBOSE
+options       UHUB_DEBUG
+options       UMS_DEBUG
+options       UKBD_DEBUG
+options       UMASS_DEBUG
+options       UHID_DEBUG
+options       UGEN_DEBUG
+options       ULPT_DEBUG
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 9da9ba4fd88fd..67870f1e4c927 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.576 1999/04/09 21:14:56 nik Exp $
+#	$Id: LINT,v 1.577 1999/04/10 15:23:12 n_hibma Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -2125,5 +2125,13 @@ device        uhid0
 # Generic USB device driver
 device        ugen0
 #
+options       UHCI_DEBUG
+options       OHCI_DEBUG
 options       USB_DEBUG
-options       USBVERBOSE
+options       UHUB_DEBUG
+options       UMS_DEBUG
+options       UKBD_DEBUG
+options       UMASS_DEBUG
+options       UHID_DEBUG
+options       UGEN_DEBUG
+options       ULPT_DEBUG