Module Name: src
Committed By: dyoung
Date: Fri Jul 1 20:44:21 UTC 2011
Modified Files:
src/sys/arch/evbarm/mpcsa: mpcsa_machdep.c
src/sys/arch/evbarm/npwr_fc: com_obio.c npwr_fc_machdep.c npwr_fc_pci.c
src/sys/arch/evbarm/nslu2: nslu2_machdep.c
src/sys/arch/evbarm/osk5912: if_sm_emifs.c osk5912_machdep.c
src/sys/arch/evbarm/smdk2xx0: if_cs_smdk24x0.c smdk2410_kbd.c
smdk2410_lcd.c smdk2410_machdep.c smdk2800_machdep.c smdk2800_pci.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/npwr_fc/com_obio.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/npwr_fc/npwr_fc_pci.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/nslu2/nslu2_machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/osk5912/if_sm_emifs.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/osk5912/osk5912_machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/smdk2xx0/smdk2800_pci.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/mpcsa/mpcsa_machdep.c
diff -u src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c:1.5 src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c:1.6
--- src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c:1.5 Thu Jun 30 20:09:26 2011
+++ src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c Fri Jul 1 20:44:20 2011
@@ -1,5 +1,5 @@
-/* $Id: mpcsa_machdep.c,v 1.5 2011/06/30 20:09:26 wiz Exp $ */
-/* $NetBSD: mpcsa_machdep.c,v 1.5 2011/06/30 20:09:26 wiz Exp $ */
+/* $Id: mpcsa_machdep.c,v 1.6 2011/07/01 20:44:20 dyoung Exp $ */
+/* $NetBSD: mpcsa_machdep.c,v 1.6 2011/07/01 20:44:20 dyoung Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpcsa_machdep.c,v 1.5 2011/06/30 20:09:26 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpcsa_machdep.c,v 1.6 2011/07/01 20:44:20 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -104,7 +104,7 @@
#define DRAM_BLOCKS 1
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: src/sys/arch/evbarm/npwr_fc/com_obio.c
diff -u src/sys/arch/evbarm/npwr_fc/com_obio.c:1.4 src/sys/arch/evbarm/npwr_fc/com_obio.c:1.5
--- src/sys/arch/evbarm/npwr_fc/com_obio.c:1.4 Mon Apr 28 20:23:17 2008
+++ src/sys/arch/evbarm/npwr_fc/com_obio.c Fri Jul 1 20:44:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_obio.c,v 1.4 2008/04/28 20:23:17 martin Exp $ */
+/* $NetBSD: com_obio.c,v 1.5 2011/07/01 20:44:20 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.4 2008/04/28 20:23:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.5 2011/07/01 20:44:20 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/i80321var.h>
Index: src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
diff -u src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.15 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.16
--- src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.15 Thu Jun 30 20:09:27 2011
+++ src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c Fri Jul 1 20:44:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: npwr_fc_machdep.c,v 1.15 2011/06/30 20:09:27 wiz Exp $ */
+/* $NetBSD: npwr_fc_machdep.c,v 1.16 2011/07/01 20:44:20 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.15 2011/06/30 20:09:27 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.16 2011/07/01 20:44:20 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -99,7 +99,7 @@
#include <ddb/db_extern.h>
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: src/sys/arch/evbarm/npwr_fc/npwr_fc_pci.c
diff -u src/sys/arch/evbarm/npwr_fc/npwr_fc_pci.c:1.2 src/sys/arch/evbarm/npwr_fc/npwr_fc_pci.c:1.3
--- src/sys/arch/evbarm/npwr_fc/npwr_fc_pci.c:1.2 Mon Apr 4 20:37:49 2011
+++ src/sys/arch/evbarm/npwr_fc/npwr_fc_pci.c Fri Jul 1 20:44:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: npwr_fc_pci.c,v 1.2 2011/04/04 20:37:49 dyoung Exp $ */
+/* $NetBSD: npwr_fc_pci.c,v 1.3 2011/07/01 20:44:20 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,14 +40,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npwr_fc_pci.c,v 1.2 2011/04/04 20:37:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npwr_fc_pci.c,v 1.3 2011/07/01 20:44:20 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80321/iq80321reg.h>
#include <evbarm/iq80321/iq80321var.h>
Index: src/sys/arch/evbarm/nslu2/nslu2_machdep.c
diff -u src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.18 src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.19
--- src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.18 Thu Jun 30 20:09:28 2011
+++ src/sys/arch/evbarm/nslu2/nslu2_machdep.c Fri Jul 1 20:44:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: nslu2_machdep.c,v 1.18 2011/06/30 20:09:28 wiz Exp $ */
+/* $NetBSD: nslu2_machdep.c,v 1.19 2011/07/01 20:44:20 dyoung Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -94,7 +94,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.18 2011/06/30 20:09:28 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.19 2011/07/01 20:44:20 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -120,7 +120,7 @@
#include <ddb/db_extern.h>
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: src/sys/arch/evbarm/osk5912/if_sm_emifs.c
diff -u src/sys/arch/evbarm/osk5912/if_sm_emifs.c:1.3 src/sys/arch/evbarm/osk5912/if_sm_emifs.c:1.4
--- src/sys/arch/evbarm/osk5912/if_sm_emifs.c:1.3 Wed Oct 17 19:54:13 2007
+++ src/sys/arch/evbarm/osk5912/if_sm_emifs.c Fri Jul 1 20:44:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sm_emifs.c,v 1.3 2007/10/17 19:54:13 garbled Exp $ */
+/* $NetBSD: if_sm_emifs.c,v 1.4 2011/07/01 20:44:21 dyoung Exp $ */
/*
* OSK5912 SMC91Cxx wrapper, based on sys/arch/evbarm/viper/if_sm_pxaip.c
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sm_emifs.c,v 1.3 2007/10/17 19:54:13 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sm_emifs.c,v 1.4 2011/07/01 20:44:21 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,7 +42,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/osk5912/osk5912_machdep.c
diff -u src/sys/arch/evbarm/osk5912/osk5912_machdep.c:1.10 src/sys/arch/evbarm/osk5912/osk5912_machdep.c:1.11
--- src/sys/arch/evbarm/osk5912/osk5912_machdep.c:1.10 Thu Jun 30 20:09:28 2011
+++ src/sys/arch/evbarm/osk5912/osk5912_machdep.c Fri Jul 1 20:44:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: osk5912_machdep.c,v 1.10 2011/06/30 20:09:28 wiz Exp $ */
+/* $NetBSD: osk5912_machdep.c,v 1.11 2011/07/01 20:44:21 dyoung Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -99,7 +99,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osk5912_machdep.c,v 1.10 2011/06/30 20:09:28 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osk5912_machdep.c,v 1.11 2011/07/01 20:44:21 dyoung Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
@@ -132,7 +132,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>
Index: src/sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c
diff -u src/sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c:1.3 src/sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c:1.4
--- src/sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c:1.3 Tue Sep 22 14:55:19 2009
+++ src/sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c Fri Jul 1 20:44:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cs_smdk24x0.c,v 1.3 2009/09/22 14:55:19 tsutsui Exp $ */
+/* $NetBSD: if_cs_smdk24x0.c,v 1.4 2011/07/01 20:44:21 dyoung Exp $ */
/*
* Copyright (c) 2003 Genetec corporation. All rights reserved.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs_smdk24x0.c,v 1.3 2009/09/22 14:55:19 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs_smdk24x0.c,v 1.4 2011/07/01 20:44:21 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,7 +88,7 @@
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arch/arm/s3c2xx0/s3c2410reg.h>
Index: src/sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c
diff -u src/sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c:1.6 src/sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c:1.7
--- src/sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c:1.6 Mon Jun 7 15:17:24 2010
+++ src/sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c Fri Jul 1 20:44:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: smdk2410_kbd.c,v 1.6 2010/06/07 15:17:24 bsh Exp $ */
+/* $NetBSD: smdk2410_kbd.c,v 1.7 2011/07/01 20:44:21 dyoung Exp $ */
/*
* Copyright (c) 2004 Genetec Corporation. All rights reserved.
@@ -40,13 +40,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2410_kbd.c,v 1.6 2010/06/07 15:17:24 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2410_kbd.c,v 1.7 2011/07/01 20:44:21 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <dev/wscons/wsconsio.h>
Index: src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c
diff -u src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c:1.5 src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c:1.6
--- src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c:1.5 Fri Feb 5 21:10:58 2010
+++ src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c Fri Jul 1 20:44:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: smdk2410_lcd.c,v 1.5 2010/02/05 21:10:58 snj Exp $ */
+/* $NetBSD: smdk2410_lcd.c,v 1.6 2011/07/01 20:44:21 dyoung Exp $ */
/*
* Copyright (c) 2004 Genetec Corporation. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2410_lcd.c,v 1.5 2010/02/05 21:10:58 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2410_lcd.c,v 1.6 2011/07/01 20:44:21 dyoung Exp $");
/*
* LCD driver for Samsung SMDK2410.
@@ -54,7 +54,7 @@
#include <dev/wscons/wsdisplayvar.h>
#include <dev/wscons/wscons_callbacks.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/s3c2xx0/s3c24x0var.h>
#include <arm/s3c2xx0/s3c24x0reg.h>
#include <arm/s3c2xx0/s3c2410reg.h>
Index: src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
diff -u src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.28 src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.29
--- src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.28 Thu Jun 30 20:09:28 2011
+++ src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c Fri Jul 1 20:44:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: smdk2410_machdep.c,v 1.28 2011/06/30 20:09:28 wiz Exp $ */
+/* $NetBSD: smdk2410_machdep.c,v 1.29 2011/07/01 20:44:21 dyoung Exp $ */
/*
* Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.28 2011/06/30 20:09:28 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.29 2011/07/01 20:44:21 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -136,7 +136,7 @@
#endif
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <machine/intr.h>
Index: src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
diff -u src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.36 src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.37
--- src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.36 Thu Jun 30 20:09:28 2011
+++ src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c Fri Jul 1 20:44:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: smdk2800_machdep.c,v 1.36 2011/06/30 20:09:28 wiz Exp $ */
+/* $NetBSD: smdk2800_machdep.c,v 1.37 2011/07/01 20:44:21 dyoung Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Fujitsu Component Limited
@@ -106,7 +106,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.36 2011/06/30 20:09:28 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.37 2011/07/01 20:44:21 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -138,7 +138,7 @@
#endif
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <machine/intr.h>
Index: src/sys/arch/evbarm/smdk2xx0/smdk2800_pci.c
diff -u src/sys/arch/evbarm/smdk2xx0/smdk2800_pci.c:1.4 src/sys/arch/evbarm/smdk2xx0/smdk2800_pci.c:1.5
--- src/sys/arch/evbarm/smdk2xx0/smdk2800_pci.c:1.4 Sun Dec 11 12:17:09 2005
+++ src/sys/arch/evbarm/smdk2xx0/smdk2800_pci.c Fri Jul 1 20:44:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: smdk2800_pci.c,v 1.4 2005/12/11 12:17:09 christos Exp $ */
+/* $NetBSD: smdk2800_pci.c,v 1.5 2011/07/01 20:44:21 dyoung Exp $ */
/*
* Copyright (c) 2002 Fujitsu Component Limited
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2800_pci.c,v 1.4 2005/12/11 12:17:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2800_pci.c,v 1.5 2011/07/01 20:44:21 dyoung Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -46,7 +46,7 @@
#include <sys/extent.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pciconf.h>
