Module Name: src
Committed By: riastradh
Date: Thu Jul 17 17:11:12 UTC 2014
Modified Files:
src/sys/dev/usb: uatp.c
src/sys/modules/uatp: uatp.ioconf
Log Message:
Fix wsmouse at uatp attachment for module.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/usb/uatp.c
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/uatp/uatp.ioconf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/uatp.c
diff -u src/sys/dev/usb/uatp.c:1.9 src/sys/dev/usb/uatp.c:1.10
--- src/sys/dev/usb/uatp.c:1.9 Mon Jul 14 14:58:32 2014
+++ src/sys/dev/usb/uatp.c Thu Jul 17 17:11:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uatp.c,v 1.9 2014/07/14 14:58:32 riastradh Exp $ */
+/* $NetBSD: uatp.c,v 1.10 2014/07/17 17:11:12 riastradh Exp $ */
/*-
* Copyright (c) 2011-2014 The NetBSD Foundation, Inc.
@@ -146,7 +146,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uatp.c,v 1.9 2014/07/14 14:58:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uatp.c,v 1.10 2014/07/17 17:11:12 riastradh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -974,7 +974,8 @@ uatp_attach(device_t parent, device_t se
/* Attach wsmouse. */
a.accessops = &uatp_accessops;
a.accesscookie = sc;
- sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint);
+ sc->sc_wsmousedev = config_found_ia(self, "wsmousedev", &a,
+ wsmousedevprint);
}
/* Sysctl setup */
Index: src/sys/modules/uatp/uatp.ioconf
diff -u src/sys/modules/uatp/uatp.ioconf:1.1 src/sys/modules/uatp/uatp.ioconf:1.2
--- src/sys/modules/uatp/uatp.ioconf:1.1 Sat Aug 4 04:37:26 2012
+++ src/sys/modules/uatp/uatp.ioconf Thu Jul 17 17:11:12 2014
@@ -1,4 +1,4 @@
-# $NetBSD: uatp.ioconf,v 1.1 2012/08/04 04:37:26 riastradh Exp $
+# $NetBSD: uatp.ioconf,v 1.2 2014/07/17 17:11:12 riastradh Exp $
ioconf uatp
@@ -8,4 +8,3 @@ include "dev/usb/files.usb"
pseudo-root uhidev*
uatp* at uhidev? reportid ?
-wsmouse* at uatp? mux 0
