14 files changed, 0 insertions, 69 deletions

diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index a3b4b4bf04dd..5b232702f46b 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -74,11 +74,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/file.h>
-#if __FreeBSD_version >= 500014
 #include <sys/selinfo.h>
-#else
-#include <sys/select.h>
-#endif
 #include <sys/proc.h>
 #include <sys/poll.h>
 #include <sys/sysctl.h>
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index 0260cb6d8c9f..67b324c5132d 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -79,11 +79,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/tty.h>
 #include <sys/clist.h>
 #include <sys/file.h>
-#if __FreeBSD_version >= 500014
 #include <sys/selinfo.h>
-#else
-#include <sys/select.h>
-#endif
 #include <sys/proc.h>
 #include <sys/poll.h>
 #include <sys/sysctl.h>
diff --git a/sys/dev/usb/udbp.c b/sys/dev/usb/udbp.c
index 1ad11bccfb56..1a8cb24d08ac 100644
--- a/sys/dev/usb/udbp.c
+++ b/sys/dev/usb/udbp.c
@@ -79,11 +79,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/file.h>
-#if __FreeBSD_version >= 500014
 #include <sys/selinfo.h>
-#else
-#include <sys/select.h>
-#endif
 #include <sys/poll.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/dev/usb/ufm.c b/sys/dev/usb/ufm.c
index 8439abb2cad2..f6b4bc1578f6 100644
--- a/sys/dev/usb/ufm.c
+++ b/sys/dev/usb/ufm.c
@@ -50,11 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/uio.h>
 #include <sys/tty.h>
 #include <sys/file.h>
-#if __FreeBSD_version >= 500014
 #include <sys/selinfo.h>
-#else
-#include <sys/select.h>
-#endif
 #include <sys/poll.h>
 #include <sys/sysctl.h>
 
@@ -95,9 +91,6 @@ Static struct cdevsw ufm_cdevsw = {
 	.d_close =	ufmclose,
 	.d_ioctl =	ufmioctl,
 	.d_name =	"ufm",
-#if (__FreeBSD_version < 500014)
- 	.d_bmaj =	-1
-#endif
 };
 #endif  /*defined(__FreeBSD__)*/
 
diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index 15318cefce34..19f5eef0ad2f 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -57,11 +57,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/tty.h>
 #include <sys/file.h>
 
-#if __FreeBSD_version >= 500014
 #include <sys/selinfo.h>
-#else
-#include <sys/select.h>
-#endif
 
 #include <sys/sysctl.h>
 
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 9f25c459f62f..0e0a862ab985 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -69,11 +69,7 @@ __FBSDID("$FreeBSD$");
 #endif
 #include <sys/conf.h>
 #include <sys/tty.h>
-#if __FreeBSD_version >= 500014
 #include <sys/selinfo.h>
-#else
-#include <sys/select.h>
-#endif
 #include <sys/proc.h>
 #include <sys/poll.h>
 #include <sys/sysctl.h>
@@ -168,9 +164,6 @@ Static struct cdevsw uhid_cdevsw = {
 	.d_ioctl =	uhidioctl,
 	.d_poll =	uhidpoll,
 	.d_name =	"uhid",
-#if __FreeBSD_version < 500014
-	.d_bmaj		-1
-#endif
 };
 #endif
 
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 905961347a98..c16ebda1eb06 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -165,9 +165,6 @@ Static struct cdevsw ulpt_cdevsw = {
 	.d_read =	ulptread,
 	.d_ioctl =	ulptioctl,
 	.d_name =	"ulpt",
-#if __FreeBSD_version < 500014
-	.d_bmaj		-1
-#endif
 };
 #endif
 
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index 0a7d4fce04fd..962a111b3e56 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -155,9 +155,6 @@ Static struct cdevsw ums_cdevsw = {
 	.d_ioctl =	ums_ioctl,
 	.d_poll =	ums_poll,
 	.d_name =	"ums",
-#if __FreeBSD_version < 500014
-	.d_bmaj		-1
-#endif
 };
 
 USB_DECLARE_DRIVER(ums);
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index d347d338dd62..98862082c7a4 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -98,11 +98,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/serial.h>
 #include <sys/tty.h>
 #include <sys/file.h>
-#if __FreeBSD_version >= 500014
 #include <sys/selinfo.h>
-#else
-#include <sys/select.h>
-#endif
 #include <sys/proc.h>
 #include <sys/poll.h>
 #include <sys/sysctl.h>
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index 68efc9c19e54..687c9a4f43e4 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -62,11 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/uio.h>
 #include <sys/tty.h>
 #include <sys/file.h>
-#if __FreeBSD_version >= 500014
 #include <sys/selinfo.h>
-#else
-#include <sys/select.h>
-#endif
 #include <sys/poll.h>
 #include <sys/sysctl.h>
 #include <sys/uio.h>
@@ -125,9 +121,6 @@ Static struct cdevsw urio_cdevsw = {
 	.d_write =	uriowrite,
 	.d_ioctl =	urioioctl,
 	.d_name =	"urio",
-#if __FreeBSD_version < 500014
- 	.d_bmaj =	-1
-#endif
 };
 #define RIO_UE_GET_DIR(p) ((UE_GET_DIR(p) == UE_DIR_IN) ? RIO_IN :\
 		 	  ((UE_GET_DIR(p) == UE_DIR_OUT) ? RIO_OUT :\
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index e4fef02f71ae..3e323129558f 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -73,11 +73,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/poll.h>
-#if __FreeBSD_version >= 500014
 #include <sys/selinfo.h>
-#else
-#include <sys/select.h>
-#endif
 #include <sys/signalvar.h>
 #include <sys/sysctl.h>
 #include <sys/uio.h>
@@ -158,9 +154,6 @@ struct cdevsw usb_cdevsw = {
 	.d_ioctl =	usbioctl,
 	.d_poll =	usbpoll,
 	.d_name =	"usb",
-#if __FreeBSD_version < 500014
-	.d_bmaj =	-1
-#endif
 };
 #endif
 
diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h
index 07dd4b39faba..c82fe8c4aced 100644
--- a/sys/dev/usb/usb.h
+++ b/sys/dev/usb/usb.h
@@ -98,11 +98,7 @@ typedef u_int8_t uDWord[4];
 #define USETDW(w,v) (*(u_int32_t *)(w) = (v))
 #endif
 
-#if defined(__FreeBSD__) && (__FreeBSD_version <= 500014)
-#define UPACKED __attribute__ ((packed))
-#else
 #define UPACKED __packed
-#endif
 
 typedef struct {
 	uByte		bmRequestType;
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index 4989236367f0..5e3e655e56d7 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -61,11 +61,7 @@ __FBSDID("$FreeBSD$");
 #endif
 #include <sys/tty.h>
 #include <sys/file.h>
-#if __FreeBSD_version >= 500014
 #include <sys/selinfo.h>
-#else
-#include <sys/select.h>
-#endif
 #include <sys/proc.h>
 #include <sys/poll.h>
 #include <sys/conf.h>
@@ -293,9 +289,6 @@ Static struct cdevsw uscanner_cdevsw = {
 	.d_write =	uscannerwrite,
 	.d_poll =	uscannerpoll,
 	.d_name =	"uscanner",
-#if __FreeBSD_version < 500014
-	.d_bmaj		-1
-#endif
 };
 #endif
 
diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c
index 07e42f5cf2d3..66a5ddd5ab57 100644
--- a/sys/dev/usb/uvscom.c
+++ b/sys/dev/usb/uvscom.c
@@ -51,12 +51,8 @@ __FBSDID("$FreeBSD$");
 #if defined(__FreeBSD__)
 #include <sys/bus.h>
 #include <sys/ioccom.h>
-#if __FreeBSD_version >= 500014
 #include <sys/selinfo.h>
 #else
-#include <sys/select.h>
-#endif
-#else
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #endif