Module Name: src
Committed By: dyoung
Date: Fri Jul 1 18:40:02 UTC 2011
Modified Files:
src/sys/arch/mips/atheros: ar5312_board.c ar5312_intr.c ar5315_intr.c
arbus.c
src/sys/arch/mips/atheros/dev: argpio.c arspi.c athflash.c com_arbus.c
if_ae.c if_ath_arbus.c
src/sys/arch/mips/atheros/include: ar531xvar.h arbusvar.h
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/atheros/ar5312_board.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/atheros/ar5312_intr.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/atheros/ar5315_intr.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mips/atheros/arbus.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/atheros/dev/argpio.c \
src/sys/arch/mips/atheros/dev/athflash.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/atheros/dev/arspi.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mips/atheros/dev/com_arbus.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/mips/atheros/dev/if_ae.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/mips/atheros/dev/if_ath_arbus.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/atheros/include/ar531xvar.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/atheros/include/arbusvar.h
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/atheros/ar5312_board.c
diff -u src/sys/arch/mips/atheros/ar5312_board.c:1.2 src/sys/arch/mips/atheros/ar5312_board.c:1.3
--- src/sys/arch/mips/atheros/ar5312_board.c:1.2 Mon Jul 6 00:43:22 2009
+++ src/sys/arch/mips/atheros/ar5312_board.c Fri Jul 1 18:40:00 2011
@@ -1,4 +1,4 @@
-/* $Id: ar5312_board.c,v 1.2 2009/07/06 00:43:22 alc Exp $ */
+/* $Id: ar5312_board.c,v 1.3 2011/07/01 18:40:00 dyoung Exp $ */
/*
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
* Copyright (c) 2006 Garrett D'Amore.
@@ -40,13 +40,13 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ar5312_board.c,v 1.2 2009/07/06 00:43:22 alc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ar5312_board.c,v 1.3 2011/07/01 18:40:00 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/atheros/include/ar5312reg.h>
#include <mips/atheros/include/ar531xvar.h>
Index: src/sys/arch/mips/atheros/ar5312_intr.c
diff -u src/sys/arch/mips/atheros/ar5312_intr.c:1.7 src/sys/arch/mips/atheros/ar5312_intr.c:1.8
--- src/sys/arch/mips/atheros/ar5312_intr.c:1.7 Sun Feb 20 07:48:36 2011
+++ src/sys/arch/mips/atheros/ar5312_intr.c Fri Jul 1 18:40:00 2011
@@ -1,4 +1,4 @@
-/* $Id: ar5312_intr.c,v 1.7 2011/02/20 07:48:36 matt Exp $ */
+/* $Id: ar5312_intr.c,v 1.8 2011/07/01 18:40:00 dyoung Exp $ */
/*
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
* Copyright (c) 2006 Garrett D'Amore.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ar5312_intr.c,v 1.7 2011/02/20 07:48:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ar5312_intr.c,v 1.8 2011/07/01 18:40:00 dyoung Exp $");
#define __INTR_PRIVATE
@@ -52,7 +52,7 @@
#include <sys/device.h>
#include <sys/kernel.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <mips/locore.h>
Index: src/sys/arch/mips/atheros/ar5315_intr.c
diff -u src/sys/arch/mips/atheros/ar5315_intr.c:1.6 src/sys/arch/mips/atheros/ar5315_intr.c:1.7
--- src/sys/arch/mips/atheros/ar5315_intr.c:1.6 Sun Feb 20 07:48:36 2011
+++ src/sys/arch/mips/atheros/ar5315_intr.c Fri Jul 1 18:40:00 2011
@@ -1,4 +1,4 @@
-/* $Id: ar5315_intr.c,v 1.6 2011/02/20 07:48:36 matt Exp $ */
+/* $Id: ar5315_intr.c,v 1.7 2011/07/01 18:40:00 dyoung Exp $ */
/*
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
* Copyright (c) 2006 Garrett D'Amore.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ar5315_intr.c,v 1.6 2011/02/20 07:48:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ar5315_intr.c,v 1.7 2011/07/01 18:40:00 dyoung Exp $");
#define __INTR_PRIVATE
@@ -52,7 +52,7 @@
#include <sys/device.h>
#include <sys/kernel.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <mips/locore.h>
Index: src/sys/arch/mips/atheros/arbus.c
diff -u src/sys/arch/mips/atheros/arbus.c:1.12 src/sys/arch/mips/atheros/arbus.c:1.13
--- src/sys/arch/mips/atheros/arbus.c:1.12 Sun Feb 20 07:48:36 2011
+++ src/sys/arch/mips/atheros/arbus.c Fri Jul 1 18:40:00 2011
@@ -1,4 +1,4 @@
-/* $Id: arbus.c,v 1.12 2011/02/20 07:48:36 matt Exp $ */
+/* $Id: arbus.c,v 1.13 2011/07/01 18:40:00 dyoung Exp $ */
/*
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
* Copyright (c) 2006 Garrett D'Amore.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arbus.c,v 1.12 2011/02/20 07:48:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arbus.c,v 1.13 2011/07/01 18:40:00 dyoung Exp $");
#include "locators.h"
#include <sys/param.h>
@@ -51,7 +51,7 @@
#include <sys/malloc.h>
#define _MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/atheros/include/ar5312reg.h>
#include <mips/atheros/include/ar531xvar.h>
#include <mips/atheros/include/arbusvar.h>
Index: src/sys/arch/mips/atheros/dev/argpio.c
diff -u src/sys/arch/mips/atheros/dev/argpio.c:1.3 src/sys/arch/mips/atheros/dev/argpio.c:1.4
--- src/sys/arch/mips/atheros/dev/argpio.c:1.3 Mon Sep 4 05:17:26 2006
+++ src/sys/arch/mips/atheros/dev/argpio.c Fri Jul 1 18:40:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: argpio.c,v 1.3 2006/09/04 05:17:26 gdamore Exp $ */
+/* $NetBSD: argpio.c,v 1.4 2011/07/01 18:40:00 dyoung Exp $ */
/*-
* Copyright (c) 2006 Garrett D'Amore
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: argpio.c,v 1.3 2006/09/04 05:17:26 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: argpio.c,v 1.4 2011/07/01 18:40:00 dyoung Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -41,7 +41,7 @@
#include <sys/device.h>
#include <sys/gpio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <mips/atheros/include/arbusvar.h>
Index: src/sys/arch/mips/atheros/dev/athflash.c
diff -u src/sys/arch/mips/atheros/dev/athflash.c:1.3 src/sys/arch/mips/atheros/dev/athflash.c:1.4
--- src/sys/arch/mips/atheros/dev/athflash.c:1.3 Wed Jun 11 23:55:20 2008
+++ src/sys/arch/mips/atheros/dev/athflash.c Fri Jul 1 18:40:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: athflash.c,v 1.3 2008/06/11 23:55:20 cegger Exp $ */
+/* $NetBSD: athflash.c,v 1.4 2011/07/01 18:40:00 dyoung Exp $ */
/*
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: athflash.c,v 1.3 2008/06/11 23:55:20 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: athflash.c,v 1.4 2011/07/01 18:40:00 dyoung Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -92,7 +92,7 @@
#include <sys/proc.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/atheros/include/arbusvar.h>
Index: src/sys/arch/mips/atheros/dev/arspi.c
diff -u src/sys/arch/mips/atheros/dev/arspi.c:1.6 src/sys/arch/mips/atheros/dev/arspi.c:1.7
--- src/sys/arch/mips/atheros/dev/arspi.c:1.6 Wed Jun 8 23:05:48 2011
+++ src/sys/arch/mips/atheros/dev/arspi.c Fri Jul 1 18:40:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: arspi.c,v 1.6 2011/06/08 23:05:48 rmind Exp $ */
+/* $NetBSD: arspi.c,v 1.7 2011/07/01 18:40:00 dyoung Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arspi.c,v 1.6 2011/06/08 23:05:48 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arspi.c,v 1.7 2011/07/01 18:40:00 dyoung Exp $");
#include "locators.h"
@@ -55,7 +55,7 @@
#include <sys/proc.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <mips/atheros/include/ar5315reg.h>
Index: src/sys/arch/mips/atheros/dev/com_arbus.c
diff -u src/sys/arch/mips/atheros/dev/com_arbus.c:1.8 src/sys/arch/mips/atheros/dev/com_arbus.c:1.9
--- src/sys/arch/mips/atheros/dev/com_arbus.c:1.8 Wed Feb 9 22:01:44 2011
+++ src/sys/arch/mips/atheros/dev/com_arbus.c Fri Jul 1 18:40:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_arbus.c,v 1.8 2011/02/09 22:01:44 matt Exp $ */
+/* $NetBSD: com_arbus.c,v 1.9 2011/07/01 18:40:00 dyoung Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
* Copyright (c) 2006 Garrett D'Amore.
@@ -101,7 +101,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_arbus.c,v 1.8 2011/02/09 22:01:44 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_arbus.c,v 1.9 2011/07/01 18:40:00 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -111,7 +111,7 @@
#include <sys/ttydefaults.h>
#include <sys/types.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/cons.h>
#include <dev/ic/comreg.h>
Index: src/sys/arch/mips/atheros/dev/if_ae.c
diff -u src/sys/arch/mips/atheros/dev/if_ae.c:1.19 src/sys/arch/mips/atheros/dev/if_ae.c:1.20
--- src/sys/arch/mips/atheros/dev/if_ae.c:1.19 Mon Apr 5 07:19:31 2010
+++ src/sys/arch/mips/atheros/dev/if_ae.c Fri Jul 1 18:40:00 2011
@@ -1,4 +1,4 @@
-/* $Id: if_ae.c,v 1.19 2010/04/05 07:19:31 joerg Exp $ */
+/* $Id: if_ae.c,v 1.20 2011/07/01 18:40:00 dyoung Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
* Copyright (c) 2006 Garrett D'Amore.
@@ -98,7 +98,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.19 2010/04/05 07:19:31 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.20 2011/07/01 18:40:00 dyoung Exp $");
#include <sys/param.h>
@@ -123,7 +123,7 @@
#include <net/bpf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/mii/mii.h>
Index: src/sys/arch/mips/atheros/dev/if_ath_arbus.c
diff -u src/sys/arch/mips/atheros/dev/if_ath_arbus.c:1.18 src/sys/arch/mips/atheros/dev/if_ath_arbus.c:1.19
--- src/sys/arch/mips/atheros/dev/if_ath_arbus.c:1.18 Wed Feb 24 22:37:55 2010
+++ src/sys/arch/mips/atheros/dev/if_ath_arbus.c Fri Jul 1 18:40:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ath_arbus.c,v 1.18 2010/02/24 22:37:55 dyoung Exp $ */
+/* $NetBSD: if_ath_arbus.c,v 1.19 2011/07/01 18:40:01 dyoung Exp $ */
/*-
* Copyright (c) 2006 Jared D. McNeill <[email protected]>
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ath_arbus.c,v 1.18 2010/02/24 22:37:55 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_arbus.c,v 1.19 2011/07/01 18:40:01 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,7 +44,7 @@
#include <sys/kernel.h>
#include <sys/errno.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <net/if.h>
Index: src/sys/arch/mips/atheros/include/ar531xvar.h
diff -u src/sys/arch/mips/atheros/include/ar531xvar.h:1.6 src/sys/arch/mips/atheros/include/ar531xvar.h:1.7
--- src/sys/arch/mips/atheros/include/ar531xvar.h:1.6 Sun Feb 20 07:48:36 2011
+++ src/sys/arch/mips/atheros/include/ar531xvar.h Fri Jul 1 18:40:01 2011
@@ -1,4 +1,4 @@
-/* $Id: ar531xvar.h,v 1.6 2011/02/20 07:48:36 matt Exp $ */
+/* $Id: ar531xvar.h,v 1.7 2011/07/01 18:40:01 dyoung Exp $ */
/*
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
* Copyright (c) 2006 Garrett D'Amore.
@@ -44,7 +44,7 @@
#define _MIPS_ATHEROS_AR531XVAR_H_
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
struct ar531x_device {
const char *name;
Index: src/sys/arch/mips/atheros/include/arbusvar.h
diff -u src/sys/arch/mips/atheros/include/arbusvar.h:1.2 src/sys/arch/mips/atheros/include/arbusvar.h:1.3
--- src/sys/arch/mips/atheros/include/arbusvar.h:1.2 Mon Sep 4 05:17:26 2006
+++ src/sys/arch/mips/atheros/include/arbusvar.h Fri Jul 1 18:40:01 2011
@@ -1,4 +1,4 @@
-/* $Id: arbusvar.h,v 1.2 2006/09/04 05:17:26 gdamore Exp $ */
+/* $Id: arbusvar.h,v 1.3 2011/07/01 18:40:01 dyoung Exp $ */
/*
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
* Copyright (c) 2006 Garrett D'Amore.
@@ -43,7 +43,7 @@
#ifndef _MIPS_ATHEROS_ARBUSVAR_H_
#define _MIPS_ATHEROS_ARBUSVAR_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
struct arbus_attach_args {
const char *aa_name;
