kernel: Remove some more old major number related stuff.

diff --git a/sys/bus/cam/scsi/scsi_cd.c b/sys/bus/cam/scsi/scsi_cd.c
index ef9d82b..a41e797 100644 (file)
--- a/sys/bus/cam/scsi/scsi_cd.c
+++ b/sys/bus/cam/scsi/scsi_cd.c
@@ -49,7 +49,6 @@
 #include "opt_cd.h"
 
 #include <sys/param.h>
-#include <sys/bootmaj.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/buf.h>
@@ -301,7 +300,7 @@ static struct periph_driver cddriver =
 PERIPHDRIVER_DECLARE(cd, cddriver);
 
 static struct dev_ops cd_ops = {
-       { "cd", SCSICD_CDEV_MAJOR, D_DISK | D_MPSAFE },
+       { "cd", 0, D_DISK | D_MPSAFE },
        .d_open = cdopen,
        .d_close = cdclose,
        .d_read = physread,

diff --git a/sys/bus/cam/scsi/scsi_da.c b/sys/bus/cam/scsi/scsi_da.c
index e8751e2..0c83d3c 100644 (file)
--- a/sys/bus/cam/scsi/scsi_da.c
+++ b/sys/bus/cam/scsi/scsi_da.c
@@ -29,7 +29,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/bootmaj.h>
 
 #ifdef _KERNEL
 
@@ -414,7 +413,7 @@ static struct periph_driver dadriver =
 PERIPHDRIVER_DECLARE(da, dadriver);
 
 static struct dev_ops da_ops = {
-       { "da", DA_CDEV_MAJOR, D_DISK | D_MPSAFE },
+       { "da", 0, D_DISK | D_MPSAFE },
        .d_open =       daopen,
        .d_close =      daclose,
        .d_read =       physread,

diff --git a/sys/dev/disk/fd/fd.c b/sys/dev/disk/fd/fd.c
index 830619c..6971ba1 100644 (file)
--- a/sys/dev/disk/fd/fd.c
+++ b/sys/dev/disk/fd/fd.c
@@ -58,7 +58,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/bootmaj.h>
 #include <sys/kernel.h>
 #include <sys/buf.h>
 #include <sys/bus.h>

diff --git a/sys/dev/disk/iscsi/initiator/iscsi.h b/sys/dev/disk/iscsi/initiator/iscsi.h
index c964413..5bca983 100644 (file)
--- a/sys/dev/disk/iscsi/initiator/iscsi.h
+++ b/sys/dev/disk/iscsi/initiator/iscsi.h
@@ -37,7 +37,6 @@ typedef int boolean_t;
 #include <sys/objcache.h>
 #include <bus/cam/cam.h>
 #include <sys/device.h>
-#include <sys/bootmaj.h>
 
 #define ISCSIDEV       "iscsi"