diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2014-12-11 19:44:18 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2014-12-11 19:44:18 +0000 |
| commit | a0caf7a1b53e9d2096c6a7bf743b6992a0a9a295 (patch) | |
| tree | 36589a2dbca2b478aa6b4edbc77a0ad757ca3c9d /sys/arch/amd64 | |
| parent | a910e52291d2cfda61f90e627a5bad213f867725 (diff) | |
dragonflybsd has added a urio driver. conservation of urios requires
that we delete ours, which isn't actually useful.
ok mpi sthen
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/amd64/conf.c | 5 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c index 4544f4d2e6e..451cf19a8c9 100644 --- a/sys/arch/amd64/amd64/conf.c +++ b/sys/arch/amd64/amd64/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.48 2014/10/09 04:10:03 tedu Exp $ */ +/* $OpenBSD: conf.c,v 1.49 2014/12/11 19:44:16 tedu Exp $ */ /* * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. @@ -147,7 +147,6 @@ cdev_decl(cy); #include "uhid.h" #include "ugen.h" #include "ulpt.h" -#include "urio.h" #include "ucom.h" #include "cz.h" cdev_decl(cztty); @@ -248,7 +247,7 @@ struct cdevsw cdevsw[] = cdev_usbdev_init(NUHID,uhid), /* 62: USB generic HID */ cdev_usbdev_init(NUGEN,ugen), /* 63: USB generic driver */ cdev_ulpt_init(NULPT,ulpt), /* 64: USB printers */ - cdev_urio_init(NURIO,urio), /* 65: USB Diamond Rio 500 */ + cdev_notdef(), /* 65: urio */ cdev_tty_init(NUCOM,ucom), /* 66: USB tty */ cdev_mouse_init(NWSKBD, wskbd), /* 67: keyboards */ cdev_mouse_init(NWSMOUSE, /* 68: mice */ diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 7dfabe30702..d47d0fcc7d2 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.381 2014/12/10 05:50:58 jsg Exp $ +# $OpenBSD: GENERIC,v 1.382 2014/12/11 19:44:17 tedu Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -240,7 +240,6 @@ udav* at uhub? # Davicom DM9601 based Ethernet mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS -urio* at uhub? # Diamond Multimedia Rio 500 udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio uberry* at uhub? # Research In Motion Blackberry |