From ee20548ddcf1e21f7f0b709491e1f0a94b3c672a Mon Sep 17 00:00:00 2001
From: joe <joe@FreeBSD.org>
Date: Mon, 25 Aug 2003 22:01:06 +0000
Subject: [PATCH] Fix the cdevsw compatibility for -stable.

---
 sys/dev/usb/ucom.c     | 2 +-
 sys/dev/usb/ufm.c      | 2 +-
 sys/dev/usb/ugen.c     | 2 +-
 sys/dev/usb/uhid.c     | 2 +-
 sys/dev/usb/ulpt.c     | 2 +-
 sys/dev/usb/ums.c      | 3 ---
 sys/dev/usb/urio.c     | 2 +-
 sys/dev/usb/usb.c      | 2 +-
 sys/dev/usb/uscanner.c | 2 +-
 9 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index 0ec2140e2fa0..b398661c9974 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -140,7 +140,7 @@ static struct cdevsw ucom_cdevsw = {
 	.d_maj =	UCOM_CDEV_MAJOR,
 	.d_flags =	D_TTY,
 #if __FreeBSD_version < 500014
-	/* bmaj */	-1,
+	.d_bmaj =	-1,
 #endif
 	.d_kqfilter =	ttykqfilter,
 };
diff --git a/sys/dev/usb/ufm.c b/sys/dev/usb/ufm.c
index 217eb37214df..89d7501f426a 100644
--- a/sys/dev/usb/ufm.c
+++ b/sys/dev/usb/ufm.c
@@ -98,7 +98,7 @@ Static struct cdevsw ufm_cdevsw = {
 	.d_name =	"ufm",
 	.d_maj =	UFM_CDEV_MAJOR,
 #if (__FreeBSD_version < 500014)
- 	-1
+ 	.d_bmaj =	-1
 #endif
 };
 #endif  /*defined(__FreeBSD__)*/
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index 5a62c7fbc395..b056d2f1040d 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -155,7 +155,7 @@ Static struct cdevsw ugen_cdevsw = {
 	.d_name =	"ugen",
 	.d_maj =	UGEN_CDEV_MAJOR,
 #if __FreeBSD_version < 500014
-	/* bmaj */	-1
+	.d_bmaj		-1
 #endif
 };
 #endif
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 591c5a76020c..57f8e2904659 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -164,7 +164,7 @@ Static struct cdevsw uhid_cdevsw = {
 	.d_name =	"uhid",
 	.d_maj =	UHID_CDEV_MAJOR,
 #if __FreeBSD_version < 500014
-	/* bmaj */	-1
+	.d_bmaj		-1
 #endif
 };
 #endif
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 7e1ce890aa8a..46a452ccd6e3 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -156,7 +156,7 @@ Static struct cdevsw ulpt_cdevsw = {
 	.d_name =	"ulpt",
 	.d_maj =	ULPT_CDEV_MAJOR,
 #if __FreeBSD_version < 500014
-	/* bmaj */	-1
+	.d_bmaj		-1
 #endif
 };
 #endif
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index 95283f2c68e9..32e91015cc5b 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -158,9 +158,6 @@ Static struct cdevsw ums_cdevsw = {
 	.d_poll =	ums_poll,
 	.d_name =	"ums",
 	.d_maj =	UMS_CDEV_MAJOR,
-#if __FreeBSD_version < 500014
-	/* bmaj */	-1
-#endif
 };
 
 USB_DECLARE_DRIVER(ums);
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index 25c08567c55e..6614a33eb93e 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -126,7 +126,7 @@ Static struct cdevsw urio_cdevsw = {
 	.d_name =	"urio",
 	.d_maj =	URIO_CDEV_MAJOR,
 #if __FreeBSD_version < 500014
- 	-1
+ 	.d_bmaj =	-1
 #endif
 };
 #define RIO_UE_GET_DIR(p) ((UE_GET_DIR(p) == UE_DIR_IN) ? RIO_IN :\
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 5812b355add4..b7a6d0ab22ac 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -151,7 +151,7 @@ struct cdevsw usb_cdevsw = {
 	.d_name =	"usb",
 	.d_maj =	USB_CDEV_MAJOR,
 #if __FreeBSD_version < 500014
-	/* bmaj */      -1
+	.d_bmaj =	-1
 #endif
 };
 #endif
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index cff0e434ff88..8615d9a8fd36 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -267,7 +267,7 @@ Static struct cdevsw uscanner_cdevsw = {
 	.d_name =	"uscanner",
 	.d_maj =	USCANNER_CDEV_MAJOR,
 #if __FreeBSD_version < 500014
-	/* bmaj */	-1
+	.d_bmaj		-1
 #endif
 };
 #endif