diff --git a/sys/dev/sun/kbd.c b/sys/dev/sun/kbd.c
index 4f076a8cf14c..5e7892d695bd 100644
--- a/sys/dev/sun/kbd.c
+++ b/sys/dev/sun/kbd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kbd.c,v 1.8 1996/05/17 19:32:06 gwr Exp $	*/
+/*	$NetBSD: kbd.c,v 1.9 1996/10/09 00:50:55 mrg Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -67,6 +67,8 @@
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
+#include <sys/select.h>
+#include <sys/poll.h>
 
 #include <dev/ic/z8530reg.h>
 #include <machine/z8530var.h>
@@ -367,15 +369,15 @@ kbdwrite(dev, uio, flags)
 }
 
 int
-kbdselect(dev, rw, p)
+kbdpoll(dev, events, p)
 	dev_t dev;
-	int rw;
+	int events;
 	struct proc *p;
 {
 	struct kbd_softc *k;
 
 	k = kbd_cd.cd_devs[minor(dev)];
-	return (ev_select(&k->k_events, rw, p));
+	return (ev_poll(&k->k_events, events, p));
 }
 
 
diff --git a/sys/dev/sun/ms.c b/sys/dev/sun/ms.c
index f99fcf7144f0..19010e82bd8d 100644
--- a/sys/dev/sun/ms.c
+++ b/sys/dev/sun/ms.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ms.c,v 1.6 1996/05/17 19:32:09 gwr Exp $	*/
+/*	$NetBSD: ms.c,v 1.7 1996/10/09 00:50:56 mrg Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -63,6 +63,8 @@
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
+#include <sys/select.h>
+#include <sys/poll.h>
 
 #include <dev/ic/z8530reg.h>
 #include <machine/z8530var.h>
@@ -321,15 +323,15 @@ msioctl(dev, cmd, data, flag, p)
 }
 
 int
-msselect(dev, rw, p)
+mspoll(dev, events, p)
 	dev_t dev;
-	int rw;
+	int events;
 	struct proc *p;
 {
 	struct ms_softc *ms;
 
 	ms = ms_cd.cd_devs[minor(dev)];
-	return (ev_select(&ms->ms_events, rw, p));
+	return (ev_poll(&ms->ms_events, events, p));
 }