Module Name: src
Committed By: matt
Date: Sun May 16 05:16:08 UTC 2010
Modified Files:
src/sys/arch/sbmips/sbmips [matt-nb5-mips64]: autoconf.c
Log Message:
Use device_xname and <sys/intr.h>
To generate a diff of this commit:
cvs rdiff -u -r1.6.96.1 -r1.6.96.2 src/sys/arch/sbmips/sbmips/autoconf.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/sbmips/sbmips/autoconf.c
diff -u src/sys/arch/sbmips/sbmips/autoconf.c:1.6.96.1 src/sys/arch/sbmips/sbmips/autoconf.c:1.6.96.2
--- src/sys/arch/sbmips/sbmips/autoconf.c:1.6.96.1 Tue Feb 23 20:24:37 2010
+++ src/sys/arch/sbmips/sbmips/autoconf.c Sun May 16 05:16:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.6.96.1 2010/02/23 20:24:37 matt Exp $ */
+/* $NetBSD: autoconf.c,v 1.6.96.2 2010/05/16 05:16:08 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -33,14 +33,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.6.96.1 2010/02/23 20:24:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.6.96.2 2010/05/16 05:16:08 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
#include <sys/conf.h>
#include <sys/device.h>
-#include <machine/intr.h>
+#include <sys/intr.h>
void
cpu_configure(void)
@@ -61,7 +61,7 @@
/* XXXCGD don't know how to find the root device */
printf("boot device: %s\n",
- booted_device ? booted_device->dv_xname : "<unknown>");
+ booted_device ? device_xname(booted_device) : "<unknown>");
setroot(booted_device, booted_partition);
}
