summaryrefslogtreecommitdiff
path: root/sys/arch/sparc64
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/sparc64')
-rw-r--r--sys/arch/sparc64/conf/GENERIC3
-rw-r--r--sys/arch/sparc64/sparc64/conf.c5
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 56b2b69b603..120a2da8a62 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.271 2013/08/20 09:05:21 dlg Exp $
+# $OpenBSD: GENERIC,v 1.272 2013/08/20 14:27:31 ajacoutot Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -229,7 +229,6 @@ zyd* at uhub? # Zydas ZD1211
url* at uhub? # Realtek RTL8150L based adapters
wi* at uhub? # WaveLAN IEEE 802.11DS
urio* at uhub? # Diamond Multimedia Rio 500
-uscanner* at uhub? disable # USB Scanners
#uyap* at uhub? # Y@P firmware loader
udsbr* at uhub? # D-Link DSB-R100 radio
radio* at udsbr? # USB radio
diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c
index 5d76cb6b504..0a6873d357b 100644
--- a/sys/arch/sparc64/sparc64/conf.c
+++ b/sys/arch/sparc64/sparc64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.68 2013/08/08 21:13:07 kettenis Exp $ */
+/* $OpenBSD: conf.c,v 1.69 2013/08/20 14:27:31 ajacoutot Exp $ */
/* $NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */
/*
@@ -107,7 +107,6 @@ cdev_decl(pci);
#include "ulpt.h"
#include "urio.h"
#include "ucom.h"
-#include "uscanner.h"
#include "bthub.h"
@@ -256,7 +255,7 @@ struct cdevsw cdevsw[] =
cdev_ulpt_init(NULPT,ulpt), /* 93: USB printers */
cdev_urio_init(NURIO,urio), /* 94: USB Diamond Rio 500 */
cdev_tty_init(NUCOM,ucom), /* 95: USB tty */
- cdev_usbdev_init(NUSCANNER,uscanner), /* 96: USB scanners */
+ cdev_notdef(), /* 96: was USB scanners */
cdev_notdef(), /* 97 */
cdev_notdef(), /* 98 */
cdev_notdef(), /* 99 */