From 0bec780131c1105ad6cf2a2cbc989ee84ffdbb10 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <millert@cvs.openbsd.org>
Date: Mon, 21 Nov 2005 18:16:48 +0000
Subject: Move contents of sys/select.h to sys/selinfo.h in preparation for a
 userland-visible sys/select.h.  Consistent with what Net and Free do. OK
 deraadt@, tested with full ports build by naddy@.

---
 sys/dev/audio.c                | 4 ++--
 sys/dev/eisa/if_ep_eisa.c      | 4 ++--
 sys/dev/ic/com.c               | 4 ++--
 sys/dev/ic/cy.c                | 4 ++--
 sys/dev/ic/elink3.c            | 4 ++--
 sys/dev/ic/opl.c               | 4 ++--
 sys/dev/ic/oplinstrs.c         | 4 ++--
 sys/dev/isa/if_ef_isapnp.c     | 4 ++--
 sys/dev/isa/if_eg.c            | 4 ++--
 sys/dev/isa/if_ep_isa.c        | 4 ++--
 sys/dev/isa/if_ep_isapnp.c     | 4 ++--
 sys/dev/isa/if_hp.c            | 4 ++--
 sys/dev/isa/if_lc_isa.c        | 4 ++--
 sys/dev/isa/if_ne_isa.c        | 4 ++--
 sys/dev/isa/if_ne_isapnp.c     | 4 ++--
 sys/dev/isa/if_sm_isa.c        | 4 ++--
 sys/dev/isa/midi_pcppi.c       | 4 ++--
 sys/dev/isa/opl_ess.c          | 4 ++--
 sys/dev/isa/opl_isa.c          | 4 ++--
 sys/dev/isa/opl_sb.c           | 4 ++--
 sys/dev/midisyn.c              | 4 ++--
 sys/dev/midivar.h              | 4 ++--
 sys/dev/pci/auixp.c            | 4 ++--
 sys/dev/pci/bktr/bktr_os.c     | 6 +++---
 sys/dev/pci/bktr/bktr_reg.h    | 4 ++--
 sys/dev/pci/emuxki.c           | 4 ++--
 sys/dev/pci/esa.c              | 4 ++--
 sys/dev/pci/if_ep_pci.c        | 4 ++--
 sys/dev/pci/opl_eso.c          | 4 ++--
 sys/dev/pci/opl_yds.c          | 4 ++--
 sys/dev/pcmcia/aic_pcmcia.c    | 4 ++--
 sys/dev/pcmcia/com_pcmcia.c    | 4 ++--
 sys/dev/pcmcia/if_awi_pcmcia.c | 4 ++--
 sys/dev/pcmcia/if_ep_pcmcia.c  | 4 ++--
 sys/dev/pcmcia/if_ne_pcmcia.c  | 4 ++--
 sys/dev/pcmcia/if_sm_pcmcia.c  | 4 ++--
 sys/dev/puc/com_puc.c          | 4 ++--
 sys/dev/sequencer.c            | 4 ++--
 sys/dev/usb/ehci.c             | 4 ++--
 sys/dev/usb/ohci.c             | 4 ++--
 sys/dev/usb/uaudio.c           | 4 ++--
 sys/dev/usb/ubsa.c             | 6 +-----
 sys/dev/usb/ucom.c             | 4 ++--
 sys/dev/usb/ugen.c             | 4 ++--
 sys/dev/usb/uhci.c             | 4 ++--
 sys/dev/usb/uhid.c             | 4 ++--
 sys/dev/usb/ukbd.c             | 4 ++--
 sys/dev/usb/umct.c             | 4 ++--
 sys/dev/usb/umidi.c            | 4 ++--
 sys/dev/usb/umidi_quirks.c     | 4 ++--
 sys/dev/usb/umodem.c           | 4 ++--
 sys/dev/usb/ums.c              | 4 ++--
 sys/dev/usb/uplcom.c           | 4 ++--
 sys/dev/usb/urio.c             | 4 ++--
 sys/dev/usb/usb.c              | 4 ++--
 sys/dev/usb/usb_subr.c         | 4 ++--
 sys/dev/usb/uscanner.c         | 6 +-----
 sys/dev/wscons/wsevent.c       | 4 ++--
 58 files changed, 115 insertions(+), 123 deletions(-)

(limited to 'sys/dev')

diff --git a/sys/dev/audio.c b/sys/dev/audio.c
index 01137c92a4c..cafb8d75310 100644
--- a/sys/dev/audio.c
+++ b/sys/dev/audio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: audio.c,v 1.46 2005/06/02 19:04:18 joris Exp $	*/
+/*	$OpenBSD: audio.c,v 1.47 2005/11/21 18:16:38 millert Exp $	*/
 /*	$NetBSD: audio.c,v 1.119 1999/11/09 16:50:47 augustss Exp $	*/
 
 /*
@@ -68,7 +68,7 @@
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/vnode.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/poll.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
diff --git a/sys/dev/eisa/if_ep_eisa.c b/sys/dev/eisa/if_ep_eisa.c
index c8da5199b63..0a985814b3f 100644
--- a/sys/dev/eisa/if_ep_eisa.c
+++ b/sys/dev/eisa/if_ep_eisa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ep_eisa.c,v 1.19 2004/10/29 19:35:13 miod Exp $	*/
+/*	$OpenBSD: if_ep_eisa.c,v 1.20 2005/11/21 18:16:39 millert Exp $	*/
 /*	$NetBSD: if_ep_eisa.c,v 1.13 1997/04/18 00:50:33 cgd Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/device.h>
 
 #include <net/if.h>
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index 2afb17b734a..9d1cb63e9bc 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com.c,v 1.107 2005/11/11 15:22:00 fgsch Exp $	*/
+/*	$OpenBSD: com.c,v 1.108 2005/11/21 18:16:39 millert Exp $	*/
 /*	$NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $	*/
 
 /*
@@ -65,7 +65,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/user.h>
diff --git a/sys/dev/ic/cy.c b/sys/dev/ic/cy.c
index 897e889b369..cda20beff29 100644
--- a/sys/dev/ic/cy.c
+++ b/sys/dev/ic/cy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cy.c,v 1.24 2003/10/03 16:44:51 miod Exp $	*/
+/*	$OpenBSD: cy.c,v 1.25 2005/11/21 18:16:39 millert Exp $	*/
 /*
  * Copyright (c) 1996 Timo Rossi.
  * All rights reserved.
@@ -63,7 +63,7 @@
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/user.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c
index 7e337e5bc86..559c823ddc5 100644
--- a/sys/dev/ic/elink3.c
+++ b/sys/dev/ic/elink3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: elink3.c,v 1.65 2005/11/14 12:24:34 mickey Exp $	*/
+/*	$OpenBSD: elink3.c,v 1.66 2005/11/21 18:16:39 millert Exp $	*/
 /*	$NetBSD: elink3.c,v 1.32 1997/05/14 00:22:00 thorpej Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/device.h>
 
 #include <net/if.h>
diff --git a/sys/dev/ic/opl.c b/sys/dev/ic/opl.c
index 02704e044e7..c18530ab414 100644
--- a/sys/dev/ic/opl.c
+++ b/sys/dev/ic/opl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opl.c,v 1.6 2003/10/21 18:58:49 jmc Exp $	*/
+/*	$OpenBSD: opl.c,v 1.7 2005/11/21 18:16:39 millert Exp $	*/
 /*	$NetBSD: opl.c,v 1.7 1998/12/08 14:26:56 augustss Exp $	*/
 
 /*
@@ -48,7 +48,7 @@
 #include <sys/ioctl.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 
 #include <machine/cpu.h>
 #include <machine/bus.h>
diff --git a/sys/dev/ic/oplinstrs.c b/sys/dev/ic/oplinstrs.c
index dd32b8faff9..3369277f4e0 100644
--- a/sys/dev/ic/oplinstrs.c
+++ b/sys/dev/ic/oplinstrs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: oplinstrs.c,v 1.2 2001/05/01 02:21:42 mickey Exp $	*/
+/*	$OpenBSD: oplinstrs.c,v 1.3 2005/11/21 18:16:39 millert Exp $	*/
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -6,7 +6,7 @@
 #include <sys/ioctl.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/dev/isa/if_ef_isapnp.c b/sys/dev/isa/if_ef_isapnp.c
index 49fb365dd79..f0a49a8f8f5 100644
--- a/sys/dev/isa/if_ef_isapnp.c
+++ b/sys/dev/isa/if_ef_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ef_isapnp.c,v 1.19 2005/11/09 05:46:21 brad Exp $	*/
+/*	$OpenBSD: if_ef_isapnp.c,v 1.20 2005/11/21 18:16:40 millert Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -35,7 +35,7 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c
index ff53e8e86b6..9ffc03ca0b9 100644
--- a/sys/dev/isa/if_eg.c
+++ b/sys/dev/isa/if_eg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_eg.c,v 1.26 2004/05/12 06:35:11 tedu Exp $	*/
+/*	$OpenBSD: if_eg.c,v 1.27 2005/11/21 18:16:40 millert Exp $	*/
 /*	$NetBSD: if_eg.c,v 1.26 1996/05/12 23:52:27 mycroft Exp $	*/
 
 /*
@@ -48,7 +48,7 @@
 #include <sys/errno.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/device.h>
 
 #include <net/if.h>
diff --git a/sys/dev/isa/if_ep_isa.c b/sys/dev/isa/if_ep_isa.c
index 0917638af9f..b47f468b294 100644
--- a/sys/dev/isa/if_ep_isa.c
+++ b/sys/dev/isa/if_ep_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ep_isa.c,v 1.22 2004/12/26 21:22:13 miod Exp $	*/
+/*	$OpenBSD: if_ep_isa.c,v 1.23 2005/11/21 18:16:40 millert Exp $	*/
 /*	$NetBSD: if_ep_isa.c,v 1.5 1996/05/12 23:52:36 mycroft Exp $	*/
 
 /*
@@ -45,7 +45,7 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 
diff --git a/sys/dev/isa/if_ep_isapnp.c b/sys/dev/isa/if_ep_isapnp.c
index 10124ebffa9..bf03d7e625a 100644
--- a/sys/dev/isa/if_ep_isapnp.c
+++ b/sys/dev/isa/if_ep_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ep_isapnp.c,v 1.8 2004/05/12 06:35:11 tedu Exp $	*/
+/*	$OpenBSD: if_ep_isapnp.c,v 1.9 2005/11/21 18:16:40 millert Exp $	*/
 /*	$NetBSD: if_ep_isapnp.c,v 1.5 1996/05/12 23:52:36 mycroft Exp $	*/
 
 /*
@@ -45,7 +45,7 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 
diff --git a/sys/dev/isa/if_hp.c b/sys/dev/isa/if_hp.c
index f929276038f..e1cbd70790d 100644
--- a/sys/dev/isa/if_hp.c
+++ b/sys/dev/isa/if_hp.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: if_hp.c,v 1.14 2004/09/28 01:02:14 brad Exp $       */
+/*    $OpenBSD: if_hp.c,v 1.15 2005/11/21 18:16:40 millert Exp $       */
 /*    $NetBSD: if_hp.c,v 1.21 1995/12/24 02:31:31 mycroft Exp $       */
 
 /* XXX THIS DRIVER IS BROKEN.  IT WILL NOT EVEN COMPILE. */
@@ -76,7 +76,7 @@
 
 #include "bpfilter.h"
 #if NBPFILTER > 0
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <net/bpf.h>
 #endif
 
diff --git a/sys/dev/isa/if_lc_isa.c b/sys/dev/isa/if_lc_isa.c
index e2cd42c2212..a25d22bc731 100644
--- a/sys/dev/isa/if_lc_isa.c
+++ b/sys/dev/isa/if_lc_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_lc_isa.c,v 1.6 2005/11/14 12:28:00 mickey Exp $ */
+/*	$OpenBSD: if_lc_isa.c,v 1.7 2005/11/21 18:16:40 millert Exp $ */
 /*	$NetBSD: if_lc_isa.c,v 1.10 2001/06/13 10:46:03 wiz Exp $ */
 
 /*-
@@ -42,7 +42,7 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 
diff --git a/sys/dev/isa/if_ne_isa.c b/sys/dev/isa/if_ne_isa.c
index a69740b7d73..7a087cccff5 100644
--- a/sys/dev/isa/if_ne_isa.c
+++ b/sys/dev/isa/if_ne_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ne_isa.c,v 1.9 2005/10/22 23:26:05 brad Exp $	*/
+/*	$OpenBSD: if_ne_isa.c,v 1.10 2005/11/21 18:16:40 millert Exp $	*/
 /*	$NetBSD: if_ne_isa.c,v 1.6 1998/07/05 06:49:13 jonathan Exp $	*/
 
 /*-
@@ -47,7 +47,7 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/device.h>
 
 #include <net/if.h>
diff --git a/sys/dev/isa/if_ne_isapnp.c b/sys/dev/isa/if_ne_isapnp.c
index 5b5aa32ff8b..b9b727224b7 100644
--- a/sys/dev/isa/if_ne_isapnp.c
+++ b/sys/dev/isa/if_ne_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ne_isapnp.c,v 1.8 2005/10/22 23:26:05 brad Exp $	*/
+/*	$OpenBSD: if_ne_isapnp.c,v 1.9 2005/11/21 18:16:40 millert Exp $	*/
 /*	$NetBSD: if_ne_isapnp.c,v 1.7 1998/07/23 19:30:45 christos Exp $	*/
 
 /*-
@@ -47,7 +47,7 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/device.h>
 
 #include <net/if.h>
diff --git a/sys/dev/isa/if_sm_isa.c b/sys/dev/isa/if_sm_isa.c
index bbd28ab4f60..2c90380701e 100644
--- a/sys/dev/isa/if_sm_isa.c
+++ b/sys/dev/isa/if_sm_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sm_isa.c,v 1.5 2005/06/08 17:03:00 henning Exp $	*/
+/*	$OpenBSD: if_sm_isa.c,v 1.6 2005/11/21 18:16:40 millert Exp $	*/
 /*	$NetBSD: if_sm_isa.c,v 1.4 1998/07/05 06:49:14 jonathan Exp $	*/
 
 /*-
@@ -47,7 +47,7 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/device.h>
 
 #include <net/if.h>
diff --git a/sys/dev/isa/midi_pcppi.c b/sys/dev/isa/midi_pcppi.c
index ed303aef605..a0a4d61965c 100644
--- a/sys/dev/isa/midi_pcppi.c
+++ b/sys/dev/isa/midi_pcppi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: midi_pcppi.c,v 1.3 2003/04/27 11:22:53 ho Exp $	*/
+/*	$OpenBSD: midi_pcppi.c,v 1.4 2005/11/21 18:16:40 millert Exp $	*/
 /*	$NetBSD: midi_pcppi.c,v 1.4 1998/11/25 22:17:06 augustss Exp $	*/
 
 /*
@@ -45,7 +45,7 @@
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/audioio.h>
 #include <sys/midiio.h>
 
diff --git a/sys/dev/isa/opl_ess.c b/sys/dev/isa/opl_ess.c
index aadb1665631..8e1ba457f0a 100644
--- a/sys/dev/isa/opl_ess.c
+++ b/sys/dev/isa/opl_ess.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opl_ess.c,v 1.3 2003/04/27 11:22:53 ho Exp $	*/
+/*	$OpenBSD: opl_ess.c,v 1.4 2005/11/21 18:16:40 millert Exp $	*/
 /*	$NetBSD: opl_ess.c,v 1.3 1998/12/08 14:26:57 augustss Exp $	*/
 
 /*
@@ -44,7 +44,7 @@
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/audioio.h>
 #include <sys/midiio.h>
 
diff --git a/sys/dev/isa/opl_isa.c b/sys/dev/isa/opl_isa.c
index 24c0ed1de09..f59e1a754ce 100644
--- a/sys/dev/isa/opl_isa.c
+++ b/sys/dev/isa/opl_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opl_isa.c,v 1.3 2002/03/14 01:26:56 millert Exp $	*/
+/*	$OpenBSD: opl_isa.c,v 1.4 2005/11/21 18:16:40 millert Exp $	*/
 /*	$NetBSD: opl_isa.c,v 1.1 1998/08/26 13:33:59 augustss Exp $	*/
 
 /*
@@ -44,7 +44,7 @@
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/audioio.h>
 #include <sys/midiio.h>
 
diff --git a/sys/dev/isa/opl_sb.c b/sys/dev/isa/opl_sb.c
index d817c6b71be..b0dd8ccf474 100644
--- a/sys/dev/isa/opl_sb.c
+++ b/sys/dev/isa/opl_sb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opl_sb.c,v 1.3 2003/04/27 11:22:53 ho Exp $	*/
+/*	$OpenBSD: opl_sb.c,v 1.4 2005/11/21 18:16:40 millert Exp $	*/
 /*	$NetBSD: opl_sb.c,v 1.4 1998/12/08 14:26:57 augustss Exp $	*/
 
 /*
@@ -45,7 +45,7 @@
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/audioio.h>
 #include <sys/midiio.h>
 
diff --git a/sys/dev/midisyn.c b/sys/dev/midisyn.c
index b9a16aaa645..86e29965324 100644
--- a/sys/dev/midisyn.c
+++ b/sys/dev/midisyn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: midisyn.c,v 1.4 2003/02/24 23:57:11 tedu Exp $	*/
+/*	$OpenBSD: midisyn.c,v 1.5 2005/11/21 18:16:38 millert Exp $	*/
 /*	$NetBSD: midisyn.c,v 1.5 1998/11/25 22:17:07 augustss Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/vnode.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
diff --git a/sys/dev/midivar.h b/sys/dev/midivar.h
index 2bc6bf0f412..427a841391c 100644
--- a/sys/dev/midivar.h
+++ b/sys/dev/midivar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: midivar.h,v 1.4 2004/10/01 04:08:45 jsg Exp $	*/
+/*	$OpenBSD: midivar.h,v 1.5 2005/11/21 18:16:38 millert Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Alexandre Ratchov
@@ -21,7 +21,7 @@
 
 #include <dev/midi_if.h>
 #include <sys/device.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/proc.h>
 #include <sys/timeout.h>
 
diff --git a/sys/dev/pci/auixp.c b/sys/dev/pci/auixp.c
index d0e3bc25a1d..0b8fa974cbc 100644
--- a/sys/dev/pci/auixp.c
+++ b/sys/dev/pci/auixp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auixp.c,v 1.1 2005/08/07 20:08:45 mickey Exp $ */
+/* $OpenBSD: auixp.c,v 1.2 2005/11/21 18:16:40 millert Exp $ */
 /* $NetBSD: auixp.c,v 1.9 2005/06/27 21:13:09 thorpej Exp $ */
 
 /*
@@ -58,7 +58,7 @@
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/exec.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/audioio.h>
 #include <sys/queue.h>
 
diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c
index 4670b2cccd7..99fd0455ce3 100644
--- a/sys/dev/pci/bktr/bktr_os.c
+++ b/sys/dev/pci/bktr/bktr_os.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bktr_os.c,v 1.19 2004/06/29 12:24:57 mickey Exp $	*/
+/*	$OpenBSD: bktr_os.c,v 1.20 2005/11/21 18:16:41 millert Exp $	*/
 /* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp $ */
 
 /*
@@ -74,7 +74,7 @@
 #include <sys/signalvar.h>
 #include <sys/mman.h>
 #include <sys/poll.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/vnode.h>
 
 #include <vm/vm.h>
@@ -147,7 +147,7 @@ SYSCTL_INT(_hw_bt848, OID_AUTO, slow_msp_audio, CTLFLAG_RW, &bt848_slow_msp_audi
 #include <sys/signalvar.h>
 #include <sys/mman.h>
 #include <sys/poll.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/vnode.h>
 #if NRADIO > 0
 #include <sys/radioio.h>
diff --git a/sys/dev/pci/bktr/bktr_reg.h b/sys/dev/pci/bktr/bktr_reg.h
index 9ac715629ed..909f6d4cf5a 100644
--- a/sys/dev/pci/bktr/bktr_reg.h
+++ b/sys/dev/pci/bktr/bktr_reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bktr_reg.h,v 1.7 2004/06/29 12:24:57 mickey Exp $	*/
+/*	$OpenBSD: bktr_reg.h,v 1.8 2005/11/21 18:16:41 millert Exp $	*/
 /*
  * $FreeBSD: src/sys/dev/bktr/bktr_reg.h,v 1.42 2000/10/31 13:09:56 roger Exp $
  *
@@ -49,7 +49,7 @@
 #if defined(__NetBSD__) || defined(__OpenBSD__)
 #include <machine/bus.h>		/* struct device */
 #include <sys/device.h>
-#include <sys/select.h>			/* struct selinfo */
+#include <sys/selinfo.h>			/* struct selinfo */
 # ifdef DEBUG
 #  define	bootverbose 1
 # else
diff --git a/sys/dev/pci/emuxki.c b/sys/dev/pci/emuxki.c
index 4788e48ecc3..605f886f440 100644
--- a/sys/dev/pci/emuxki.c
+++ b/sys/dev/pci/emuxki.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: emuxki.c,v 1.20 2005/08/09 04:10:11 mickey Exp $	*/
+/*	$OpenBSD: emuxki.c,v 1.21 2005/11/21 18:16:41 millert Exp $	*/
 /*	$NetBSD: emuxki.c,v 1.1 2001/10/17 18:39:41 jdolecek Exp $	*/
 
 /*-
@@ -63,7 +63,7 @@
 #include <sys/systm.h>
 #include <sys/param.h>
 #include <sys/audioio.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/esa.c b/sys/dev/pci/esa.c
index 945b7624135..b7bdc550c1e 100644
--- a/sys/dev/pci/esa.c
+++ b/sys/dev/pci/esa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: esa.c,v 1.9 2005/08/09 04:10:11 mickey Exp $	*/
+/*	$OpenBSD: esa.c,v 1.10 2005/11/21 18:16:41 millert Exp $	*/
 /* $NetBSD: esa.c,v 1.12 2002/03/24 14:17:35 jmcneill Exp $ */
 
 /*
@@ -51,7 +51,7 @@
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/exec.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/audioio.h>
 
 #include <machine/bus.h>
diff --git a/sys/dev/pci/if_ep_pci.c b/sys/dev/pci/if_ep_pci.c
index 1886515574c..f44747dc6b1 100644
--- a/sys/dev/pci/if_ep_pci.c
+++ b/sys/dev/pci/if_ep_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ep_pci.c,v 1.25 2005/09/11 18:17:08 mickey Exp $	*/
+/*	$OpenBSD: if_ep_pci.c,v 1.26 2005/11/21 18:16:41 millert Exp $	*/
 /*	$NetBSD: if_ep_pci.c,v 1.13 1996/10/21 22:56:38 thorpej Exp $	*/
 
 /*
@@ -40,7 +40,7 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/device.h>
 
 #include <net/if.h>
diff --git a/sys/dev/pci/opl_eso.c b/sys/dev/pci/opl_eso.c
index 6a0afd4bb35..c8f2414387f 100644
--- a/sys/dev/pci/opl_eso.c
+++ b/sys/dev/pci/opl_eso.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opl_eso.c,v 1.4 2003/04/27 11:22:53 ho Exp $	*/
+/*	$OpenBSD: opl_eso.c,v 1.5 2005/11/21 18:16:41 millert Exp $	*/
 /*	$NetBSD: opl_eso.c,v 1.1 1999/07/12 15:13:31 kleink Exp $	*/
 
 /*
@@ -53,7 +53,7 @@
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/audioio.h>
 #include <sys/midiio.h>
 
diff --git a/sys/dev/pci/opl_yds.c b/sys/dev/pci/opl_yds.c
index 8210c3c9787..4f378779d7a 100644
--- a/sys/dev/pci/opl_yds.c
+++ b/sys/dev/pci/opl_yds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opl_yds.c,v 1.4 2003/04/27 11:22:53 ho Exp $	*/
+/*	$OpenBSD: opl_yds.c,v 1.5 2005/11/21 18:16:41 millert Exp $	*/
 /*	$NetBSD$	*/
 
 /*
@@ -45,7 +45,7 @@
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/audioio.h>
 #include <sys/midiio.h>
 
diff --git a/sys/dev/pcmcia/aic_pcmcia.c b/sys/dev/pcmcia/aic_pcmcia.c
index b125b9c5876..0734bf9b600 100644
--- a/sys/dev/pcmcia/aic_pcmcia.c
+++ b/sys/dev/pcmcia/aic_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic_pcmcia.c,v 1.11 2005/01/27 17:04:55 millert Exp $	*/
+/*	$OpenBSD: aic_pcmcia.c,v 1.12 2005/11/21 18:16:41 millert Exp $	*/
 /*	$NetBSD: aic_pcmcia.c,v 1.6 1998/07/19 17:28:15 christos Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/device.h>
 
 #include <machine/cpu.h>
diff --git a/sys/dev/pcmcia/com_pcmcia.c b/sys/dev/pcmcia/com_pcmcia.c
index af370b32839..c9b7a549b35 100644
--- a/sys/dev/pcmcia/com_pcmcia.c
+++ b/sys/dev/pcmcia/com_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com_pcmcia.c,v 1.42 2005/09/26 22:32:06 miod Exp $	*/
+/*	$OpenBSD: com_pcmcia.c,v 1.43 2005/11/21 18:16:41 millert Exp $	*/
 /*	$NetBSD: com_pcmcia.c,v 1.15 1998/08/22 17:47:58 msaitoh Exp $	*/
 
 /*
@@ -98,7 +98,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/user.h>
diff --git a/sys/dev/pcmcia/if_awi_pcmcia.c b/sys/dev/pcmcia/if_awi_pcmcia.c
index 86c3b599966..ea78c4cf609 100644
--- a/sys/dev/pcmcia/if_awi_pcmcia.c
+++ b/sys/dev/pcmcia/if_awi_pcmcia.c
@@ -1,5 +1,5 @@
 /* $NetBSD: if_awi_pcmcia.c,v 1.13 2000/03/22 11:22:20 onoe Exp $ */
-/* $OpenBSD: if_awi_pcmcia.c,v 1.15 2005/02/21 11:16:00 dlg Exp $ */
+/* $OpenBSD: if_awi_pcmcia.c,v 1.16 2005/11/21 18:16:42 millert Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/device.h>
 
 #include <net/if.h>
diff --git a/sys/dev/pcmcia/if_ep_pcmcia.c b/sys/dev/pcmcia/if_ep_pcmcia.c
index 41d7391843f..0c9bf9524c3 100644
--- a/sys/dev/pcmcia/if_ep_pcmcia.c
+++ b/sys/dev/pcmcia/if_ep_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ep_pcmcia.c,v 1.33 2005/06/08 17:03:01 henning Exp $	*/
+/*	$OpenBSD: if_ep_pcmcia.c,v 1.34 2005/11/21 18:16:42 millert Exp $	*/
 /*	$NetBSD: if_ep_pcmcia.c,v 1.16 1998/08/17 23:20:40 thorpej Exp $  */
 
 /*-
@@ -76,7 +76,7 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/device.h>
 
 #include <net/if.h>
diff --git a/sys/dev/pcmcia/if_ne_pcmcia.c b/sys/dev/pcmcia/if_ne_pcmcia.c
index 30df0ad79f2..f04b25cb016 100644
--- a/sys/dev/pcmcia/if_ne_pcmcia.c
+++ b/sys/dev/pcmcia/if_ne_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ne_pcmcia.c,v 1.82 2005/10/22 23:26:06 brad Exp $	*/
+/*	$OpenBSD: if_ne_pcmcia.c,v 1.83 2005/11/21 18:16:42 millert Exp $	*/
 /*	$NetBSD: if_ne_pcmcia.c,v 1.17 1998/08/15 19:00:04 thorpej Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/device.h>
 #include <sys/socket.h>
 
diff --git a/sys/dev/pcmcia/if_sm_pcmcia.c b/sys/dev/pcmcia/if_sm_pcmcia.c
index d57b051518f..78dbe79b69d 100644
--- a/sys/dev/pcmcia/if_sm_pcmcia.c
+++ b/sys/dev/pcmcia/if_sm_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sm_pcmcia.c,v 1.23 2005/06/08 17:03:01 henning Exp $	*/
+/*	$OpenBSD: if_sm_pcmcia.c,v 1.24 2005/11/21 18:16:42 millert Exp $	*/
 /*	$NetBSD: if_sm_pcmcia.c,v 1.11 1998/08/15 20:47:32 thorpej Exp $  */
 
 /*-
@@ -47,7 +47,7 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/device.h>
 
 #include <net/if.h>
diff --git a/sys/dev/puc/com_puc.c b/sys/dev/puc/com_puc.c
index 4a81caa0afd..13ce0303bae 100644
--- a/sys/dev/puc/com_puc.c
+++ b/sys/dev/puc/com_puc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com_puc.c,v 1.9 2005/09/26 22:32:06 miod Exp $	*/
+/*	$OpenBSD: com_puc.c,v 1.10 2005/11/21 18:16:42 millert Exp $	*/
 
 /*
  * Copyright (c) 1997 - 1999, Jason Downs.  All rights reserved.
@@ -31,7 +31,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/user.h>
diff --git a/sys/dev/sequencer.c b/sys/dev/sequencer.c
index 74d1ef0ba94..81eebcf7d50 100644
--- a/sys/dev/sequencer.c
+++ b/sys/dev/sequencer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sequencer.c,v 1.10 2004/10/10 07:13:16 jsg Exp $	*/
+/*	$OpenBSD: sequencer.c,v 1.11 2005/11/21 18:16:38 millert Exp $	*/
 /*	$NetBSD: sequencer.c,v 1.13 1998/11/25 22:17:07 augustss Exp $	*/
 
 /*
@@ -44,7 +44,7 @@
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/vnode.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/poll.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c
index 013c47a9f53..4f619730749 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/dev/usb/ehci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ehci.c,v 1.51 2005/11/15 07:02:37 miod Exp $ */
+/*	$OpenBSD: ehci.c,v 1.52 2005/11/21 18:16:42 millert Exp $ */
 /*	$NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $	*/
 
 /*
@@ -64,7 +64,7 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 136070e9045..88ff878ee35 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ohci.c,v 1.63 2005/11/15 07:02:37 miod Exp $ */
+/*	$OpenBSD: ohci.c,v 1.64 2005/11/21 18:16:42 millert Exp $ */
 /*	$NetBSD: ohci.c,v 1.139 2003/02/22 05:24:16 tsutsui Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $	*/
 
@@ -52,7 +52,7 @@
 #if defined(__NetBSD__) || defined(__OpenBSD__)
 #include <sys/kernel.h>
 #include <sys/device.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #elif defined(__FreeBSD__)
 #include <sys/module.h>
 #include <sys/bus.h>
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c
index 15bc4a7a5c7..d99470935ec 100644
--- a/sys/dev/usb/uaudio.c
+++ b/sys/dev/usb/uaudio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uaudio.c,v 1.22 2005/08/01 05:36:48 brad Exp $ */
+/*	$OpenBSD: uaudio.c,v 1.23 2005/11/21 18:16:43 millert Exp $ */
 /*	$NetBSD: uaudio.c,v 1.67 2003/05/03 18:11:41 wiz Exp $	*/
 
 /*
@@ -53,7 +53,7 @@
 #include <sys/tty.h>
 #include <sys/file.h>
 #include <sys/reboot.h>			/* for bootverbose */
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/device.h>
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index 6dd8595bcca..dbbca010ade 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ubsa.c,v 1.12 2005/10/29 23:35:20 deraadt Exp $ 	*/
+/*	$OpenBSD: ubsa.c,v 1.13 2005/11/21 18:16:43 millert Exp $ 	*/
 /*	$NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $	*/
 /*-
  * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
@@ -77,11 +77,7 @@
 #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/vnode.h>
 #include <sys/poll.h>
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index 4233cb57650..7e023c17ba6 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ucom.c,v 1.26 2005/04/08 04:30:17 deraadt Exp $ */
+/*	$OpenBSD: ucom.c,v 1.27 2005/11/21 18:16:43 millert Exp $ */
 /*	$NetBSD: ucom.c,v 1.49 2003/01/01 00:10:25 thorpej Exp $	*/
 
 /*
@@ -48,7 +48,7 @@
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/file.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/device.h>
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index e62083e9dd2..9bcc875d770 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ugen.c,v 1.32 2005/08/01 05:36:48 brad Exp $ */
+/*	$OpenBSD: ugen.c,v 1.33 2005/11/21 18:16:43 millert Exp $ */
 /*	$NetBSD: ugen.c,v 1.63 2002/11/26 18:49:48 christos Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $	*/
 
@@ -58,7 +58,7 @@
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/file.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/poll.h>
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index caafb124f0d..f4d36abd899 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhci.c,v 1.40 2005/11/15 07:02:37 miod Exp $	*/
+/*	$OpenBSD: uhci.c,v 1.41 2005/11/21 18:16:43 millert Exp $	*/
 /*	$NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $	*/
 
@@ -55,7 +55,7 @@
 #include <sys/malloc.h>
 #if defined(__NetBSD__) || defined(__OpenBSD__)
 #include <sys/device.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #elif defined(__FreeBSD__)
 #include <sys/module.h>
 #include <sys/bus.h>
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 895866d1c58..4c6800311b3 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhid.c,v 1.27 2004/07/08 22:18:44 deraadt Exp $ */
+/*	$OpenBSD: uhid.c,v 1.28 2005/11/21 18:16:43 millert Exp $ */
 /*	$NetBSD: uhid.c,v 1.57 2003/03/11 16:44:00 augustss Exp $	*/
 
 /*
@@ -52,7 +52,7 @@
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/file.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #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 08bca6a2d01..6fd92e02d71 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ukbd.c,v 1.22 2005/07/18 07:41:38 jsg Exp $	*/
+/*	$OpenBSD: ukbd.c,v 1.23 2005/11/21 18:16:44 millert Exp $	*/
 /*      $NetBSD: ukbd.c,v 1.85 2003/03/11 16:44:00 augustss Exp $        */
 
 /*
@@ -54,7 +54,7 @@
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/file.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/poll.h>
diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c
index 7d00d8136a9..3ade0b8518c 100644
--- a/sys/dev/usb/umct.c
+++ b/sys/dev/usb/umct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umct.c,v 1.15 2005/08/01 05:41:54 brad Exp $	*/
+/*	$OpenBSD: umct.c,v 1.16 2005/11/21 18:16:44 millert Exp $	*/
 /*	$NetBSD: umct.c,v 1.10 2003/02/23 04:20:07 simonb Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/file.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/device.h>
diff --git a/sys/dev/usb/umidi.c b/sys/dev/usb/umidi.c
index 95fc9c1dc61..582e54cb5ef 100644
--- a/sys/dev/usb/umidi.c
+++ b/sys/dev/usb/umidi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umidi.c,v 1.13 2005/09/07 05:27:47 jsg Exp $	*/
+/*	$OpenBSD: umidi.c,v 1.14 2005/11/21 18:16:44 millert Exp $	*/
 /*	$NetBSD: umidi.c,v 1.16 2002/07/11 21:14:32 augustss Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
 #include <sys/ioctl.h>
 #include <sys/conf.h>
 #include <sys/file.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/poll.h>
diff --git a/sys/dev/usb/umidi_quirks.c b/sys/dev/usb/umidi_quirks.c
index d1cfe011191..38d34512a6f 100644
--- a/sys/dev/usb/umidi_quirks.c
+++ b/sys/dev/usb/umidi_quirks.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umidi_quirks.c,v 1.6 2004/06/27 19:44:48 deraadt Exp $	*/
+/*	$OpenBSD: umidi_quirks.c,v 1.7 2005/11/21 18:16:44 millert Exp $	*/
 /*	$NetBSD: umidi_quirks.c,v 1.4 2002/06/19 13:55:30 tshiozak Exp $	*/
 
 /*
@@ -45,7 +45,7 @@
 #include <sys/ioctl.h>
 #include <sys/conf.h>
 #include <sys/file.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/poll.h>
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index 2d01c98873e..c3f965cee40 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umodem.c,v 1.19 2005/09/28 00:20:12 dlg Exp $ */
+/*	$OpenBSD: umodem.c,v 1.20 2005/11/21 18:16:44 millert Exp $ */
 /*	$NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $	*/
 
 /*
@@ -58,7 +58,7 @@
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/file.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/device.h>
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index 93fdcb0c536..25fc6991edf 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ums.c,v 1.15 2004/12/06 11:08:23 dlg Exp $ */
+/*	$OpenBSD: ums.c,v 1.16 2005/11/21 18:16:44 millert Exp $ */
 /*	$NetBSD: ums.c,v 1.60 2003/03/11 16:44:00 augustss Exp $	*/
 
 /*
@@ -50,7 +50,7 @@
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/file.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/poll.h>
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index 658fbd5e40f..1c743a3dde3 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uplcom.c,v 1.24 2005/08/01 05:36:49 brad Exp $	*/
+/*	$OpenBSD: uplcom.c,v 1.25 2005/11/21 18:16:44 millert Exp $	*/
 /*	$NetBSD: uplcom.c,v 1.29 2002/09/23 05:51:23 simonb Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/file.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/device.h>
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index 4848370fff7..513eaf0557f 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: urio.c,v 1.19 2005/08/01 05:36:49 brad Exp $	*/
+/*	$OpenBSD: urio.c,v 1.20 2005/11/21 18:16:44 millert Exp $	*/
 /*	$NetBSD: urio.c,v 1.15 2002/10/23 09:14:02 jdolecek Exp $	*/
 
 /*
@@ -60,7 +60,7 @@
 #endif
 #include <sys/conf.h>
 #include <sys/file.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/poll.h>
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 5f65b0597bf..7a4f88561a2 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb.c,v 1.31 2005/10/11 09:09:21 dlg Exp $	*/
+/*	$OpenBSD: usb.c,v 1.32 2005/11/21 18:16:44 millert Exp $	*/
 /*	$NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $	*/
 
 /*
@@ -57,7 +57,7 @@
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/poll.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/vnode.h>
 #include <sys/signalvar.h>
 
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index 3a11114e216..c8baf80f50c 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb_subr.c,v 1.40 2005/10/17 18:00:43 drahn Exp $ */
+/*	$OpenBSD: usb_subr.c,v 1.41 2005/11/21 18:16:44 millert Exp $ */
 /*	$NetBSD: usb_subr.c,v 1.103 2003/01/10 11:19:13 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $	*/
 
@@ -45,7 +45,7 @@
 #include <sys/malloc.h>
 #if defined(__NetBSD__) || defined(__OpenBSD__)
 #include <sys/device.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #elif defined(__FreeBSD__)
 #include <sys/module.h>
 #include <sys/bus.h>
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index d1c219f2469..c49018b5947 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uscanner.c,v 1.18 2005/08/01 05:36:49 brad Exp $ */
+/*	$OpenBSD: uscanner.c,v 1.19 2005/11/21 18:16:44 millert Exp $ */
 /*	$NetBSD: uscanner.c,v 1.40 2003/01/27 00:32:44 wiz Exp $	*/
 
 /*
@@ -55,11 +55,7 @@
 #endif
 #include <sys/tty.h>
 #include <sys/file.h>
-#if defined(__FreeBSD__) && __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/wscons/wsevent.c b/sys/dev/wscons/wsevent.c
index 627663f90ca..ea030c1534c 100644
--- a/sys/dev/wscons/wsevent.c
+++ b/sys/dev/wscons/wsevent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsevent.c,v 1.4 2005/05/15 11:29:15 miod Exp $ */
+/* $OpenBSD: wsevent.c,v 1.5 2005/11/21 18:16:45 millert Exp $ */
 /* $NetBSD: wsevent.c,v 1.16 2003/08/07 16:31:29 agc Exp $ */
 
 /*
@@ -83,7 +83,7 @@
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
 #include <sys/poll.h>
 
 #include <dev/wscons/wsconsio.h>
-- 
cgit v1.2.3