Module Name: src
Committed By: matt
Date: Fri Jun 26 22:20:58 UTC 2015
Modified Files:
src/sys/arch/mips/adm5120/dev: admpci.c
src/sys/arch/mips/atheros/dev: arpci.c ohci_arbus.c
Log Message:
#include <mips/locore.h> and other include cleanups.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mips/adm5120/dev/admpci.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/atheros/dev/arpci.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/atheros/dev/ohci_arbus.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/adm5120/dev/admpci.c
diff -u src/sys/arch/mips/adm5120/dev/admpci.c:1.11 src/sys/arch/mips/adm5120/dev/admpci.c:1.12
--- src/sys/arch/mips/adm5120/dev/admpci.c:1.11 Sat Jun 28 10:25:16 2014
+++ src/sys/arch/mips/adm5120/dev/admpci.c Fri Jun 26 22:20:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: admpci.c,v 1.11 2014/06/28 10:25:16 skrll Exp $ */
+/* $NetBSD: admpci.c,v 1.12 2015/06/26 22:20:58 matt Exp $ */
/*-
* Copyright (c) 2007 David Young. All rights reserved.
@@ -61,13 +61,12 @@
#include "pci.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: admpci.c,v 1.11 2014/06/28 10:25:16 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: admpci.c,v 1.12 2015/06/26 22:20:58 matt Exp $");
+#include <sys/param.h>
#include <sys/types.h>
#include <sys/bus.h>
#include <sys/cpu.h>
-
-#include <sys/param.h>
#include <sys/time.h>
#include <sys/systm.h>
#include <sys/errno.h>
@@ -85,8 +84,6 @@ __KERNEL_RCSID(0, "$NetBSD: admpci.c,v 1
#include <mips/cache.h>
#endif
-#include <mips/pte.h>
-
#include <mips/adm5120/include/adm5120_mainbusvar.h>
#include <mips/adm5120/include/adm5120reg.h>
#include <mips/adm5120/include/adm5120var.h>
Index: src/sys/arch/mips/atheros/dev/arpci.c
diff -u src/sys/arch/mips/atheros/dev/arpci.c:1.3 src/sys/arch/mips/atheros/dev/arpci.c:1.4
--- src/sys/arch/mips/atheros/dev/arpci.c:1.3 Sat Mar 29 19:28:29 2014
+++ src/sys/arch/mips/atheros/dev/arpci.c Fri Jun 26 22:20:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: arpci.c,v 1.3 2014/03/29 19:28:29 christos Exp $ */
+/* $NetBSD: arpci.c,v 1.4 2015/06/26 22:20:58 matt Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arpci.c,v 1.3 2014/03/29 19:28:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arpci.c,v 1.4 2015/06/26 22:20:58 matt Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -38,6 +38,8 @@ __KERNEL_RCSID(0, "$NetBSD: arpci.c,v 1.
#include <dev/pci/pcivar.h>
+#include <mips/locore.h>
+
#include <mips/atheros/include/arbusvar.h>
#include <mips/atheros/include/ar9344reg.h>
Index: src/sys/arch/mips/atheros/dev/ohci_arbus.c
diff -u src/sys/arch/mips/atheros/dev/ohci_arbus.c:1.1 src/sys/arch/mips/atheros/dev/ohci_arbus.c:1.2
--- src/sys/arch/mips/atheros/dev/ohci_arbus.c:1.1 Thu Jul 7 05:06:44 2011
+++ src/sys/arch/mips/atheros/dev/ohci_arbus.c Fri Jun 26 22:20:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_arbus.c,v 1.1 2011/07/07 05:06:44 matt Exp $ */
+/* $NetBSD: ohci_arbus.c,v 1.2 2015/06/26 22:20:58 matt Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003 The NetBSD Foundation, Inc.
@@ -32,12 +32,11 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_arbus.c,v 1.1 2011/07/07 05:06:44 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_arbus.c,v 1.2 2015/06/26 22:20:58 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-
#include <sys/bus.h>
#include <dev/usb/usb.h>
@@ -48,6 +47,8 @@ __KERNEL_RCSID(0, "$NetBSD: ohci_arbus.c
#include <dev/usb/ohcireg.h>
#include <dev/usb/ohcivar.h>
+#include <mips/locore.h>
+
#include <mips/atheros/include/arbusvar.h>
static int ohci_arbus_match(device_t, cfdata_t, void *);
