Re-add bmaj to the cdevsw's, but don't compile it in on -current.

This makes the code more portable between -current, -stable and the
other BSDs.

6 files changed, 18 insertions, 0 deletions

diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index 9a29509..ae18038 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -147,6 +147,9 @@ Static struct cdevsw ugen_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
+#if !defined(__FreeBSD__) || (__FreeBSD__ < 5)
+	/* bmaj */	-1
+#endif
 };
 #endif
 
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 766098c..be7e8dc 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -154,6 +154,9 @@ Static struct cdevsw uhid_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
+#if !defined(__FreeBSD__) || (__FreeBSD__ < 5)
+	/* bmaj */	-1
+#endif
 };
 #endif
 
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 6e48286..d533469 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -146,6 +146,9 @@ Static struct cdevsw ulpt_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
+#if !defined(__FreeBSD__) || (__FreeBSD__ < 5)
+	/* bmaj */	-1
+#endif
 };
 #endif
 
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index be03540..91a32d0 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -172,6 +172,9 @@ static struct cdevsw umodem_cdevsw = {
 	/* dump */      nodump,
 	/* psize */     nopsize,
 	/* flags */     D_TTY | D_KQFILTER,
+#if !defined(__FreeBSD__) || (__FreeBSD__ < 5)
+	/* bmaj */	-1,
+#endif
 	/* kqfilter */	ttykqfilter,
 };
 #endif
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index 7aeee20..f42e7b5 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -158,6 +158,9 @@ Static struct cdevsw ums_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
+#if !defined(__FreeBSD__) || (__FreeBSD__ < 5)
+	/* bmaj */	-1
+#endif
 };
 
 USB_DECLARE_DRIVER(ums);
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index f7fe5b7..e54311c 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -145,6 +145,9 @@ struct cdevsw usb_cdevsw = {
 	/* dump */      nodump,
 	/* psize */     nopsize,
 	/* flags */     0,
+#if !defined(__FreeBSD__) || (__FreeBSD__ < 5)
+	/* bmaj */      -1
+#endif
 };
 #endif