summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1999-11-18 04:20:23 +0000
committerpeter <peter@FreeBSD.org>1999-11-18 04:20:23 +0000
commit76de652082e3dd91266681272257e6504d7bd1e2 (patch)
treeb55078f312a27dc9b563b580508235664f28da4c /sys
parent31081e234ac6b93f5fb839b54429ba24adcc784f (diff)
downloadFreeBSD-src-76de652082e3dd91266681272257e6504d7bd1e2.zip
FreeBSD-src-76de652082e3dd91266681272257e6504d7bd1e2.tar.gz
Move Alpha conflicting entries (98,99) to 135,136. Renumber the zsc
CDEV_MAJOR entry to match.. Is "ipr" in the tree? I can't find it.
Diffstat (limited to 'sys')
-rw-r--r--sys/alpha/tlsb/zs_tlsb.c2
-rw-r--r--sys/conf/majors5
2 files changed, 3 insertions, 4 deletions
diff --git a/sys/alpha/tlsb/zs_tlsb.c b/sys/alpha/tlsb/zs_tlsb.c
index 544e0f2..7b22012 100644
--- a/sys/alpha/tlsb/zs_tlsb.c
+++ b/sys/alpha/tlsb/zs_tlsb.c
@@ -66,7 +66,7 @@ static d_open_t zsopen;
static d_close_t zsclose;
static d_ioctl_t zsioctl;
-#define CDEV_MAJOR 98
+#define CDEV_MAJOR 135
static struct cdevsw zs_cdevsw = {
/* open */ zsopen,
/* close */ zsclose,
diff --git a/sys/conf/majors b/sys/conf/majors
index f716236..94d54b0 100644
--- a/sys/conf/majors
+++ b/sys/conf/majors
@@ -150,9 +150,6 @@ chrdev name comments
95 md Memory Disk
96 altq alternate queueing (including cbq, red, wfq)
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
@@ -190,5 +187,7 @@ chrdev name comments
132 amr AMI MegaRAID (control device)
133 amrd AMI MegaRAID (disk device)
134 taupci Cronyx Tau-PCI card <vak@hanoi.cronyx.ru>
+135 zsc TurboLaser console uart
+136 ipr Iprobe on-chip perf. counters (gallatin@freebsd.org)
200 ?? entries from 200-255 are reserved for local use
255 ?? entries from 200-255 are reserved for local use
OpenPOWER on IntegriCloud