diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 1999-08-23 20:59:21 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 1999-08-23 20:59:21 +0000 |
| commit | 9dcbe2404a244059708f3bbc8cbfa0a14887c4ea (patch) | |
| tree | 627cf9c78fb38268a3abc09deb78d86c316d87e6 /sys/dev/atkbdc | |
| parent | d9183205179005f7582d41a23d4588b0b1140298 (diff) | |
Notes
Diffstat (limited to 'sys/dev/atkbdc')
| -rw-r--r-- | sys/dev/atkbdc/atkbd.c | 3 | ||||
| -rw-r--r-- | sys/dev/atkbdc/psm.c | 20 |
2 files changed, 4 insertions, 19 deletions
diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c index 0d00ee6773e61..3786ee9a0b988 100644 --- a/sys/dev/atkbdc/atkbd.c +++ b/sys/dev/atkbdc/atkbd.c @@ -23,13 +23,12 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: atkbd.c,v 1.13 1999/08/15 06:06:14 yokota Exp $ + * $Id: atkbd.c,v 1.14 1999/08/22 09:52:32 yokota Exp $ */ #include "atkbd.h" #include "opt_kbd.h" #include "opt_atkbd.h" -#include "opt_devfs.h" #if NATKBD > 0 diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c index bdc39dc665bbe..e7c82c97dd477 100644 --- a/sys/dev/atkbdc/psm.c +++ b/sys/dev/atkbdc/psm.c @@ -20,7 +20,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: psm.c,v 1.15 1999/08/17 12:14:13 yokota Exp $ + * $Id: psm.c,v 1.16 1999/08/22 06:11:52 yokota Exp $ */ /* @@ -65,7 +65,6 @@ #ifdef __i386__ #include "apm.h" #endif -#include "opt_devfs.h" #include "opt_psm.h" #if NPSM > 0 @@ -81,9 +80,6 @@ #include <sys/malloc.h> #include <machine/bus.h> #include <sys/rman.h> -#ifdef DEVFS -#include <sys/devfsext.h> -#endif #include <sys/select.h> #include <sys/uio.h> @@ -181,10 +177,6 @@ struct psm_softc { /* Driver status information */ int button; /* the latest button state */ int xold; /* previous absolute X position */ int yold; /* previous absolute Y position */ -#ifdef DEVFS - void *devfs_token; - void *b_devfs_token; -#endif #ifdef PSM_HOOKAPM struct apmhook resumehook; #endif @@ -1094,14 +1086,8 @@ psmattach(device_t dev) sc->state = PSM_VALID; /* Done */ -#ifdef DEVFS - sc->devfs_token = - devfs_add_devswf(&psm_cdevsw, PSM_MKMINOR(unit, FALSE), - DV_CHR, 0, 0, 0666, "psm%d", unit); - sc->b_devfs_token = - devfs_add_devswf(&psm_cdevsw, PSM_MKMINOR(unit, TRUE), - DV_CHR, 0, 0, 0666, "bpsm%d", unit); -#endif /* DEVFS */ + make_dev(&psm_cdevsw, PSM_MKMINOR(unit, FALSE), 0, 0, 0666, "psm%d", unit); + make_dev(&psm_cdevsw, PSM_MKMINOR(unit, TRUE), 0, 0, 0666, "bpsm%d", unit); #ifdef PSM_HOOKAPM sc->resumehook.ah_name = "PS/2 mouse"; |