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/dev/DEVNAMES,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/DEVNAMES,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.229.8.2
retrieving revision 1.229.8.3
diff -u -p -r1.229.8.2 -r1.229.8.3
--- src/sys/dev/DEVNAMES	2008/01/09 01:52:09	1.229.8.2
+++ src/sys/dev/DEVNAMES	2008/03/23 02:04:34	1.229.8.3
@@ -1,4 +1,4 @@
-#	$NetBSD: DEVNAMES,v 1.229.8.2 2008/01/09 01:52:09 matt Exp $
+#	DEVNAMES,v 1.229.8.2 2008/01/09 01:52:09 matt Exp
 #
 # This file contains all used device names and defined attributes in
 # alphabetical order. New devices added to the system somewhere should first
@@ -249,7 +249,6 @@ clock			cats
 clock			luna68k
 clock			mvme68k
 clock			netwinder
-clock			pc532
 clock			sparc
 clock			sparc64
 clock			sun2
@@ -480,6 +479,7 @@ gayle			amiga		Attribute
 gayle			amigappc	Attribute
 gbox			hp300
 gbus			alpha
+gcscpcib		i386
 gdrom			dreamcast
 gem			MI
 gentbi			MI
@@ -735,7 +735,6 @@ lpt			MI
 lpt			amiga
 lpt			amigappc
 lpt			mvme68k
-lpt			pc532
 lpt			sgimips
 lpt			sparc64
 lsi64854		MI		Attribute
@@ -781,7 +780,6 @@ mainbus			newsmips
 mainbus			next68k
 mainbus			ofppc
 mainbus			ofppc		Attribute
-mainbus			pc532
 mainbus			pmax
 mainbus			prep
 mainbus			prep		Attribute
@@ -886,7 +884,6 @@ mtty			MI
 mu			vax
 mulaw			MI		Attribute
 nca			MI
-ncr			pc532
 ncr5380sbc		MI		Attribute
 ncr53c9x		MI		Attribute
 ncrsc			mvme68k
@@ -1110,7 +1107,6 @@ rtc			acorn26
 rtc			acorn32
 rtc			evbmips
 rtc			hp300
-rtc			pc532
 rtc			evbppc
 rtc			sparc
 rtc			x68k
@@ -1154,7 +1150,6 @@ sci			amigappc	Attribute
 sci			evbsh3
 scif			evbsh3
 scif			hpcsh
-scn			pc532
 scr			shark
 scsi			MI		Attribute
 scsibus			MI
@@ -1333,6 +1328,7 @@ uhci			MI
 uhid			MI
 uhidbus			MI		Attribute
 uhidev			MI
+uhmodem			MI
 uhub			MI
 uipaq			MI
 uirda			MI