21 files changed, 51 insertions, 8 deletions

diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c
index 77fa52178930..6b670ea72a42 100644
--- a/sys/dev/atkbdc/psm.c
+++ b/sys/dev/atkbdc/psm.c
@@ -73,7 +73,7 @@
 #include <sys/syslog.h>
 #include <machine/bus.h>
 #include <sys/rman.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/uio.h>
 
 #include <machine/limits.h>
diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c
index 6ed546e053d2..0f8110f096d9 100644
--- a/sys/dev/bktr/bktr_os.c
+++ b/sys/dev/bktr/bktr_os.c
@@ -71,7 +71,11 @@
 #include <sys/signalvar.h>
 #include <sys/mman.h>
 #include <sys/poll.h>
+#if __FreeBSD_version >= 500014
+#include <sys/selinfo.h>
+#else
 #include <sys/select.h>
+#endif
 #include <sys/vnode.h>
 
 #include <vm/vm.h>
diff --git a/sys/dev/ed/if_ed_pccard.c b/sys/dev/ed/if_ed_pccard.c
index 0b74a2d79788..7763fb7dbca9 100644
--- a/sys/dev/ed/if_ed_pccard.c
+++ b/sys/dev/ed/if_ed_pccard.c
@@ -33,7 +33,6 @@
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/uio.h>
-#include <sys/select.h>
 
 #include <sys/module.h>
 #include <sys/bus.h>
diff --git a/sys/dev/ncv/ncr53c500_pccard.c b/sys/dev/ncv/ncr53c500_pccard.c
index ed0da2051d85..12e4f71e118f 100644
--- a/sys/dev/ncv/ncr53c500_pccard.c
+++ b/sys/dev/ncv/ncr53c500_pccard.c
@@ -87,7 +87,9 @@ extern struct ncv_softc *ncvdata[];
 #if NCARD > 0
 #include	<sys/kernel.h>
 #include	<sys/module.h>
+#if !defined(__FreeBSD__) || __FreeBSD_version < 500014
 #include	<sys/select.h>
+#endif
 #include	<pccard/cardinfo.h>
 #include	<pccard/slot.h>
 
diff --git a/sys/dev/nsp/nsp_pccard.c b/sys/dev/nsp/nsp_pccard.c
index d4914ebe668f..d0a5b968354c 100644
--- a/sys/dev/nsp/nsp_pccard.c
+++ b/sys/dev/nsp/nsp_pccard.c
@@ -83,7 +83,9 @@ extern struct nsp_softc *nspdata[];
 #if NCARD > 0
 #include	<sys/kernel.h>
 #include	<sys/module.h>
+#if !defined(__FreeBSD__) || __FreeBSD_version < 500014
 #include	<sys/select.h>
+#endif
 #include 	<pccard/cardinfo.h>
 #include	<pccard/slot.h>
 
diff --git a/sys/dev/random/harvest.c b/sys/dev/random/harvest.c
index 89a636887bff..60067dca19f1 100644
--- a/sys/dev/random/harvest.c
+++ b/sys/dev/random/harvest.c
@@ -33,7 +33,7 @@
 #include <sys/kthread.h>
 #include <sys/mutex.h>
 #include <sys/poll.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/random.h>
 
 #include <machine/cpu.h>
diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c
index 6c9ee849034a..5a39b86e7a07 100644
--- a/sys/dev/random/randomdev.c
+++ b/sys/dev/random/randomdev.c
@@ -37,7 +37,7 @@
 #include <sys/module.h>
 #include <sys/bus.h>
 #include <sys/poll.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/random.h>
 #include <sys/vnode.h>
 #include <machine/bus.h>
diff --git a/sys/dev/random/yarrow.c b/sys/dev/random/yarrow.c
index 34d1b90fc4e7..d50dcfaaed30 100644
--- a/sys/dev/random/yarrow.c
+++ b/sys/dev/random/yarrow.c
@@ -36,7 +36,7 @@
 #include <sys/kthread.h>
 #include <sys/libkern.h>
 #include <sys/mutex.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/random.h>
 #include <sys/types.h>
 #include <sys/unistd.h>
diff --git a/sys/dev/stg/tmc18c30_isa.c b/sys/dev/stg/tmc18c30_isa.c
index 67fb6b62e42b..6fe5523d8bca 100644
--- a/sys/dev/stg/tmc18c30_isa.c
+++ b/sys/dev/stg/tmc18c30_isa.c
@@ -77,7 +77,6 @@
 
 #include	<sys/kernel.h>
 #include	<sys/module.h>
-#include	<sys/select.h>
 
 static	int	stgprobe(device_t devi);
 static	int	stgattach(device_t devi);
diff --git a/sys/dev/stg/tmc18c30_pccard.c b/sys/dev/stg/tmc18c30_pccard.c
index 574fbb27c82b..e6ceb6f821b8 100644
--- a/sys/dev/stg/tmc18c30_pccard.c
+++ b/sys/dev/stg/tmc18c30_pccard.c
@@ -88,7 +88,9 @@ extern struct stg_softc *stgdata[];
 #if NCARD > 0
 #include	<sys/kernel.h>
 #include	<sys/module.h>
+#if !defined(__FreeBSD__) || __FreeBSD_version < 500014
 #include	<sys/select.h>
+#endif
 #include	<pccard/cardinfo.h>
 #include	<pccard/slot.h>
 
diff --git a/sys/dev/syscons/apm/apm_saver.c b/sys/dev/syscons/apm/apm_saver.c
index fa2047ff3e19..f4464ca64307 100644
--- a/sys/dev/syscons/apm/apm_saver.c
+++ b/sys/dev/syscons/apm/apm_saver.c
@@ -39,7 +39,7 @@
 #include <dev/fb/splashreg.h>
 #include <dev/syscons/syscons.h>
 
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <machine/apm_bios.h>
 #include <machine/pc/bios.h>
 #include <i386/apm/apm.h>
diff --git a/sys/dev/usb/udbp.c b/sys/dev/usb/udbp.c
index a7bcac0b8426..15ca63ec8cdf 100644
--- a/sys/dev/usb/udbp.c
+++ b/sys/dev/usb/udbp.c
@@ -77,7 +77,11 @@
 #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/ugen.c b/sys/dev/usb/ugen.c
index bd420cce0850..d318f13e6e9b 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -56,7 +56,11 @@
 #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/vnode.h>
 #include <sys/poll.h>
 
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index dd2a85e9909e..1cdd455ff937 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -60,7 +60,11 @@
 #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/vnode.h>
 #include <sys/poll.h>
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c
index e0d78d303b45..9f3143ae0c42 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -51,7 +51,11 @@
 #include <sys/module.h>
 #include <sys/bus.h>
 #include <sys/file.h>
+#if __FreeBSD_version >= 500014
+#include <sys/selinfo.h>
+#else
 #include <sys/select.h>
+#endif
 #include <sys/vnode.h>
 
 #include <dev/usb/usb.h>
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index 3cbfa0d3e70c..c8d43460e4a8 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -66,7 +66,11 @@
 #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/vnode.h>
 #include <sys/poll.h>
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index 7096fa86c9d1..16327823f210 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -51,7 +51,11 @@
 #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/vnode.h>
 #include <sys/poll.h>
 
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index 8dd4c6300dff..4cb4dffbcd99 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -60,7 +60,11 @@
 #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/vnode.h>
 #include <sys/poll.h>
 
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 0767649e58f9..46f1eb1fdfcc 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -60,7 +60,11 @@
 #endif
 #include <sys/conf.h>
 #include <sys/poll.h>
+#if __FreeBSD_version >= 500014
+#include <sys/selinfo.h>
+#else
 #include <sys/select.h>
+#endif
 #include <sys/vnode.h>
 #include <sys/signalvar.h>
 
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index b89152f12cad..18b7aebf9148 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -55,7 +55,11 @@
 #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/vnode.h>
 #include <sys/poll.h>
diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c
index 0aaed442187b..598ceb389680 100644
--- a/sys/dev/xe/if_xe.c
+++ b/sys/dev/xe/if_xe.c
@@ -113,7 +113,6 @@
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
-#include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/systm.h>