diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 237aecf9ef42..cb42cd57d96c 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.158 1999/04/13 19:38:09 peter Exp $
+#	$Id: GENERIC,v 1.159 1999/04/13 20:59:36 peter Exp $
 
 machine		"i386"
 cpu		"I386_CPU"
@@ -220,7 +220,5 @@ options         SYSVMSG
 #device        ums0
 #device        ukbd0
 #device        ulpt0
-#device        ucom0
-#device        umodem0
 #device        uhid0
 #device        ugen0
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 1d5adea72235..833fbc9be576 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.580 1999/04/13 19:38:09 peter Exp $
+#	$Id: LINT,v 1.581 1999/04/14 16:54:00 peter 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
@@ -2113,10 +2113,6 @@ device        ums0
 device        ukbd0
 # USB printer
 device        ulpt0
-# USB communications driver
-device        ucom0
-# USB modem driver
-device        umodem0
 # Human Interface Device (anything with buttons and dials)
 device        uhid0
 # Generic USB device driver
diff --git a/sys/conf/files b/sys/conf/files
index 72aad0994e16..66e94b039787 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -695,8 +695,6 @@ dev/usb/hid.c		optional usb device-driver
 # be the inverse of the wanted one (MAKE_SET)
 dev/usb/ugen.c		optional ugen device-driver
 dev/usb/uhid.c		optional uhid device-driver
-dev/usb/umodem.c	optional umodem device-driver
-dev/usb/ucom.c		optional ucom device-driver
 dev/usb/ums.c		optional ums device-driver
 dev/usb/ulpt.c		optional ulpt device-driver
 dev/usb/ukbd.c		optional ukbd device-driver
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 237aecf9ef42..cb42cd57d96c 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.158 1999/04/13 19:38:09 peter Exp $
+#	$Id: GENERIC,v 1.159 1999/04/13 20:59:36 peter Exp $
 
 machine		"i386"
 cpu		"I386_CPU"
@@ -220,7 +220,5 @@ options         SYSVMSG
 #device        ums0
 #device        ukbd0
 #device        ulpt0
-#device        ucom0
-#device        umodem0
 #device        uhid0
 #device        ugen0
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 1d5adea72235..833fbc9be576 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.580 1999/04/13 19:38:09 peter Exp $
+#	$Id: LINT,v 1.581 1999/04/14 16:54:00 peter 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
@@ -2113,10 +2113,6 @@ device        ums0
 device        ukbd0
 # USB printer
 device        ulpt0
-# USB communications driver
-device        ucom0
-# USB modem driver
-device        umodem0
 # Human Interface Device (anything with buttons and dials)
 device        uhid0
 # Generic USB device driver
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 1d5adea72235..833fbc9be576 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.580 1999/04/13 19:38:09 peter Exp $
+#	$Id: LINT,v 1.581 1999/04/14 16:54:00 peter 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
@@ -2113,10 +2113,6 @@ device        ums0
 device        ukbd0
 # USB printer
 device        ulpt0
-# USB communications driver
-device        ucom0
-# USB modem driver
-device        umodem0
 # Human Interface Device (anything with buttons and dials)
 device        uhid0
 # Generic USB device driver