summaryrefslogtreecommitdiffstats
path: root/sys/conf/majors
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1999-11-01 04:12:42 +0000
committerpeter <peter@FreeBSD.org>1999-11-01 04:12:42 +0000
commitfca471ec42bada1c90361e23d945d8394aee572d (patch)
treee81ef59866284be1207bda6e8312b843dea6d245 /sys/conf/majors
parentff69a3419a01e76430b1a5938ddd60bbe386df67 (diff)
downloadFreeBSD-src-fca471ec42bada1c90361e23d945d8394aee572d.zip
FreeBSD-src-fca471ec42bada1c90361e23d945d8394aee572d.tar.gz
Merge the alpha and x86 majors files together. There appear to be
only two conflicts, cdev #98 and cdev #99. These should be fixed. MAKEDEV should probably be merged as well. Static majors are (hopefully) going away one day soon. This file is informational and not machine parsed by anything any more.
Diffstat (limited to 'sys/conf/majors')
-rw-r--r--sys/conf/majors5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/conf/majors b/sys/conf/majors
index 620ff0e..dadda5d 100644
--- a/sys/conf/majors
+++ b/sys/conf/majors
@@ -149,7 +149,10 @@ chrdev name comments
94 loran Loran-C Receiver
95 md Memory Disk
96 altq alternate queueing (including cbq, red, wfq)
-97 ?? (is prom on alpha)
+97 prom Alpha PROM console
+# Alpha vs. i386 conflicts
+#98 zsc TurboLaser console uart
+#99 ipr Iprobe on-chip perf. counters (gallatin@freebsd.org)
98 loe Loopback pseudo-ethernet (sbabkin@dcn.att.com)
99 ct Cronyx/Tau serial adaptor
100 xrpu Xilinx Reprogrammable Processing Unit
OpenPOWER on IntegriCloud