Module Name: src
Committed By: cliff
Date: Wed Jan 13 09:43:31 UTC 2010
Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_obio.c
Log Message:
- don't match if attach arg name doesn;t match cf_name
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/sys/arch/mips/rmi/rmixl_obio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/rmi/rmixl_obio.c
diff -u src/sys/arch/mips/rmi/rmixl_obio.c:1.1.2.10 src/sys/arch/mips/rmi/rmixl_obio.c:1.1.2.11
--- src/sys/arch/mips/rmi/rmixl_obio.c:1.1.2.10 Sun Jan 10 03:08:35 2010
+++ src/sys/arch/mips/rmi/rmixl_obio.c Wed Jan 13 09:43:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_obio.c,v 1.1.2.10 2010/01/10 03:08:35 matt Exp $ */
+/* $NetBSD: rmixl_obio.c,v 1.1.2.11 2010/01/13 09:43:31 cliff Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_obio.c,v 1.1.2.10 2010/01/10 03:08:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_obio.c,v 1.1.2.11 2010/01/13 09:43:31 cliff Exp $");
#include "locators.h"
#include "obio.h"
@@ -62,6 +62,8 @@
#include <mips/rmi/rmixl_obiovar.h>
#include <mips/rmi/rmixl_pcievar.h>
+#include <evbmips/rmixl/autoconf.h>
+
#ifdef OBIO_DEBUG
int obio_debug = OBIO_DEBUG;
# define DPRINTF(x) do { if (obio_debug) printf x ; } while (0)
@@ -86,9 +88,13 @@
static int
obio_match(device_t parent, cfdata_t cf, void *aux)
{
- if (obio_found)
- return 0;
- return 1;
+ struct mainbus_attach_args *aa = aux;
+
+ if (obio_found == 0)
+ if (strncmp(aa->ma_name, cf->cf_name, strlen(cf->cf_name)) == 0)
+ return 1;
+
+ return 0;
}
static void
