Module Name: src
Committed By: dyoung
Date: Fri Jul 1 20:45:45 UTC 2011
Modified Files:
src/sys/arch/evbarm/tisdp24xx: if_sm_gpmc.c sdp24xx_machdep.c
src/sys/arch/evbarm/viper: if_sm_pxaip.c viper_machdep.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/tisdp24xx/if_sm_gpmc.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/viper/if_sm_pxaip.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/viper/viper_machdep.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/evbarm/tisdp24xx/if_sm_gpmc.c
diff -u src/sys/arch/evbarm/tisdp24xx/if_sm_gpmc.c:1.3 src/sys/arch/evbarm/tisdp24xx/if_sm_gpmc.c:1.4
--- src/sys/arch/evbarm/tisdp24xx/if_sm_gpmc.c:1.3 Wed Aug 27 11:03:10 2008
+++ src/sys/arch/evbarm/tisdp24xx/if_sm_gpmc.c Fri Jul 1 20:45:45 2011
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sm_gpmc.c,v 1.3 2008/08/27 11:03:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sm_gpmc.c,v 1.4 2011/07/01 20:45:45 dyoung Exp $");
#include "locators.h"
@@ -49,7 +49,7 @@
#include <net/if_media.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
Index: src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c
diff -u src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.11 src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.12
--- src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.11 Thu Jun 30 20:09:28 2011
+++ src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c Fri Jul 1 20:45:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sdp24xx_machdep.c,v 1.11 2011/06/30 20:09:28 wiz Exp $ */
+/* $NetBSD: sdp24xx_machdep.c,v 1.12 2011/07/01 20:45:45 dyoung Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdp24xx_machdep.c,v 1.11 2011/06/30 20:09:28 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdp24xx_machdep.c,v 1.12 2011/07/01 20:45:45 dyoung Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
@@ -160,7 +160,7 @@
#endif
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/armreg.h>
Index: src/sys/arch/evbarm/viper/if_sm_pxaip.c
diff -u src/sys/arch/evbarm/viper/if_sm_pxaip.c:1.4 src/sys/arch/evbarm/viper/if_sm_pxaip.c:1.5
--- src/sys/arch/evbarm/viper/if_sm_pxaip.c:1.4 Wed Oct 17 19:54:13 2007
+++ src/sys/arch/evbarm/viper/if_sm_pxaip.c Fri Jul 1 20:45:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sm_pxaip.c,v 1.4 2007/10/17 19:54:13 garbled Exp $ */
+/* $NetBSD: if_sm_pxaip.c,v 1.5 2011/07/01 20:45:45 dyoung Exp $ */
/*
* Copyright (c) 2005 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sm_pxaip.c,v 1.4 2007/10/17 19:54:13 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sm_pxaip.c,v 1.5 2011/07/01 20:45:45 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,7 +40,7 @@
#include <net/if_media.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
Index: src/sys/arch/evbarm/viper/viper_machdep.c
diff -u src/sys/arch/evbarm/viper/viper_machdep.c:1.18 src/sys/arch/evbarm/viper/viper_machdep.c:1.19
--- src/sys/arch/evbarm/viper/viper_machdep.c:1.18 Thu Jun 30 20:09:28 2011
+++ src/sys/arch/evbarm/viper/viper_machdep.c Fri Jul 1 20:45:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: viper_machdep.c,v 1.18 2011/06/30 20:09:28 wiz Exp $ */
+/* $NetBSD: viper_machdep.c,v 1.19 2011/07/01 20:45:45 dyoung Exp $ */
/*
* Startup routines for the Arcom Viper. Below you can trace the
@@ -112,7 +112,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.18 2011/06/30 20:09:28 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.19 2011/07/01 20:45:45 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -147,7 +147,7 @@
#endif
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
