Module Name: src Committed By: dyoung Date: Fri Jul 1 20:32:51 UTC 2011
Modified Files: src/sys/arch/arm/xscale: becc.c becc_pci.c becc_space.c becc_timer.c i80312.c i80312_gpio.c i80312_i2c.c i80312_mem.c i80312_pci.c i80312_space.c i80312var.h i80321.c i80321_gpio.c i80321_i2c.c i80321_icu.c i80321_mcu.c i80321_pci.c i80321_space.c i80321_timer.c i80321_wdog.c iopi2c.c ixp425.c ixp425_a4x_space.c ixp425_com.c ixp425_if_npe.c ixp425_intr.c ixp425_ixme.c ixp425_npe.c ixp425_pci.c ixp425_pci_dma.c ixp425_pci_space.c ixp425_qmgr.c ixp425_sip.c ixp425_sipvar.h ixp425_space.c ixp425_timer.c ixp425_wdog.c ixp425var.h pxa2x0.c pxa2x0_a4x_space.c pxa2x0_ac97.c pxa2x0_apm.h pxa2x0_com.c pxa2x0_dma.c pxa2x0_dmac.c pxa2x0_gpio.c pxa2x0_i2s.c pxa2x0_i2s.h pxa2x0_intr.c pxa2x0_lcd.c pxa2x0_lcd.h pxa2x0_ohci.c pxa2x0_pcic.c pxa2x0_rtc.c pxa2x0_space.c pxa2x0_udc.c Log Message: #include <sys/bus.h> instead of <machine/bus.h>. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/xscale/becc.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/xscale/becc_pci.c \ src/sys/arch/arm/xscale/i80312_pci.c src/sys/arch/arm/xscale/i80312var.h \ src/sys/arch/arm/xscale/i80321_pci.c src/sys/arch/arm/xscale/pxa2x0_lcd.h \ src/sys/arch/arm/xscale/pxa2x0_space.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/xscale/becc_space.c \ src/sys/arch/arm/xscale/i80312_i2c.c src/sys/arch/arm/xscale/i80312_mem.c \ src/sys/arch/arm/xscale/ixp425_pci_dma.c \ src/sys/arch/arm/xscale/pxa2x0_a4x_space.c \ src/sys/arch/arm/xscale/pxa2x0_dma.c src/sys/arch/arm/xscale/pxa2x0_rtc.c \ src/sys/arch/arm/xscale/pxa2x0_udc.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/xscale/becc_timer.c \ src/sys/arch/arm/xscale/ixp425.c src/sys/arch/arm/xscale/pxa2x0_gpio.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/xscale/i80312.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/xscale/i80312_gpio.c \ src/sys/arch/arm/xscale/i80321_i2c.c src/sys/arch/arm/xscale/i80321_mcu.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/xscale/i80312_space.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/xscale/i80321.c \ src/sys/arch/arm/xscale/i80321_icu.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/xscale/i80321_gpio.c \ src/sys/arch/arm/xscale/ixp425_a4x_space.c \ src/sys/arch/arm/xscale/ixp425_ixme.c \ src/sys/arch/arm/xscale/ixp425_wdog.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/xscale/i80321_space.c \ src/sys/arch/arm/xscale/ixp425var.h src/sys/arch/arm/xscale/pxa2x0_com.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/xscale/i80321_timer.c \ src/sys/arch/arm/xscale/ixp425_if_npe.c src/sys/arch/arm/xscale/pxa2x0.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/xscale/i80321_wdog.c \ src/sys/arch/arm/xscale/ixp425_pci_space.c \ src/sys/arch/arm/xscale/pxa2x0_ac97.c \ src/sys/arch/arm/xscale/pxa2x0_i2s.c \ src/sys/arch/arm/xscale/pxa2x0_pcic.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/xscale/iopi2c.c \ src/sys/arch/arm/xscale/ixp425_sipvar.h cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/xscale/ixp425_com.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/xscale/ixp425_intr.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/xscale/ixp425_npe.c \ src/sys/arch/arm/xscale/ixp425_space.c \ src/sys/arch/arm/xscale/pxa2x0_dmac.c \ src/sys/arch/arm/xscale/pxa2x0_ohci.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/xscale/ixp425_pci.c \ src/sys/arch/arm/xscale/ixp425_qmgr.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/xscale/ixp425_sip.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/xscale/ixp425_timer.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/xscale/pxa2x0_apm.h \ src/sys/arch/arm/xscale/pxa2x0_i2s.h cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/xscale/pxa2x0_intr.c cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/xscale/pxa2x0_lcd.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/arm/xscale/becc.c diff -u src/sys/arch/arm/xscale/becc.c:1.13 src/sys/arch/arm/xscale/becc.c:1.14 --- src/sys/arch/arm/xscale/becc.c:1.13 Tue May 17 17:34:48 2011 +++ src/sys/arch/arm/xscale/becc.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: becc.c,v 1.13 2011/05/17 17:34:48 dyoung Exp $ */ +/* $NetBSD: becc.c,v 1.14 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2002, 2003 Wasabi Systems, Inc. @@ -41,14 +41,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: becc.c,v 1.13 2011/05/17 17:34:48 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: becc.c,v 1.14 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> #define _ARM32_BUS_DMA_PRIVATE -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/i80200reg.h> #include <arm/xscale/beccreg.h> Index: src/sys/arch/arm/xscale/becc_pci.c diff -u src/sys/arch/arm/xscale/becc_pci.c:1.9 src/sys/arch/arm/xscale/becc_pci.c:1.10 --- src/sys/arch/arm/xscale/becc_pci.c:1.9 Mon Apr 4 20:37:46 2011 +++ src/sys/arch/arm/xscale/becc_pci.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: becc_pci.c,v 1.9 2011/04/04 20:37:46 dyoung Exp $ */ +/* $NetBSD: becc_pci.c,v 1.10 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: becc_pci.c,v 1.9 2011/04/04 20:37:46 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: becc_pci.c,v 1.10 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -51,7 +51,7 @@ #include <uvm/uvm_extern.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/beccreg.h> #include <arm/xscale/beccvar.h> Index: src/sys/arch/arm/xscale/i80312_pci.c diff -u src/sys/arch/arm/xscale/i80312_pci.c:1.9 src/sys/arch/arm/xscale/i80312_pci.c:1.10 --- src/sys/arch/arm/xscale/i80312_pci.c:1.9 Sun Dec 11 12:16:51 2005 +++ src/sys/arch/arm/xscale/i80312_pci.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: i80312_pci.c,v 1.9 2005/12/11 12:16:51 christos Exp $ */ +/* $NetBSD: i80312_pci.c,v 1.10 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i80312_pci.c,v 1.9 2005/12/11 12:16:51 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i80312_pci.c,v 1.10 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -50,7 +50,7 @@ #include <uvm/uvm_extern.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/i80312reg.h> #include <arm/xscale/i80312var.h> Index: src/sys/arch/arm/xscale/i80312var.h diff -u src/sys/arch/arm/xscale/i80312var.h:1.9 src/sys/arch/arm/xscale/i80312var.h:1.10 --- src/sys/arch/arm/xscale/i80312var.h:1.9 Sun Dec 11 12:16:51 2005 +++ src/sys/arch/arm/xscale/i80312var.h Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: i80312var.h,v 1.9 2005/12/11 12:16:51 christos Exp $ */ +/* $NetBSD: i80312var.h,v 1.10 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -38,7 +38,7 @@ #ifndef _ARM_XSCALE_I80312VAR_H_ #define _ARM_XSCALE_I80312VAR_H_ -#include <machine/bus.h> +#include <sys/bus.h> #include <dev/pci/pcivar.h> Index: src/sys/arch/arm/xscale/i80321_pci.c diff -u src/sys/arch/arm/xscale/i80321_pci.c:1.9 src/sys/arch/arm/xscale/i80321_pci.c:1.10 --- src/sys/arch/arm/xscale/i80321_pci.c:1.9 Wed Oct 17 19:53:43 2007 +++ src/sys/arch/arm/xscale/i80321_pci.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: i80321_pci.c,v 1.9 2007/10/17 19:53:43 garbled Exp $ */ +/* $NetBSD: i80321_pci.c,v 1.10 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i80321_pci.c,v 1.9 2007/10/17 19:53:43 garbled Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i80321_pci.c,v 1.10 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -50,7 +50,7 @@ #include <uvm/uvm_extern.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/i80321reg.h> #include <arm/xscale/i80321var.h> Index: src/sys/arch/arm/xscale/pxa2x0_lcd.h diff -u src/sys/arch/arm/xscale/pxa2x0_lcd.h:1.9 src/sys/arch/arm/xscale/pxa2x0_lcd.h:1.10 --- src/sys/arch/arm/xscale/pxa2x0_lcd.h:1.9 Thu Jan 29 12:28:15 2009 +++ src/sys/arch/arm/xscale/pxa2x0_lcd.h Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pxa2x0_lcd.h,v 1.9 2009/01/29 12:28:15 nonaka Exp $ */ +/* $NetBSD: pxa2x0_lcd.h,v 1.10 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2002 Genetec Corporation. All rights reserved. * Written by Hiroyuki Bessho for Genetec Corporation. @@ -37,7 +37,7 @@ #define _ARM_XSCALE_PXA2X0_LCD_H #include <dev/rasops/rasops.h> -#include <machine/bus.h> +#include <sys/bus.h> /* LCD Contoroller */ Index: src/sys/arch/arm/xscale/pxa2x0_space.c diff -u src/sys/arch/arm/xscale/pxa2x0_space.c:1.9 src/sys/arch/arm/xscale/pxa2x0_space.c:1.10 --- src/sys/arch/arm/xscale/pxa2x0_space.c:1.9 Sat Nov 7 07:27:42 2009 +++ src/sys/arch/arm/xscale/pxa2x0_space.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pxa2x0_space.c,v 1.9 2009/11/07 07:27:42 cegger Exp $ */ +/* $NetBSD: pxa2x0_space.c,v 1.10 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -76,14 +76,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pxa2x0_space.c,v 1.9 2009/11/07 07:27:42 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pxa2x0_space.c,v 1.10 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <uvm/uvm_extern.h> -#include <machine/bus.h> +#include <sys/bus.h> /* Prototypes for all the bus_space structure functions */ bs_protos(pxa2x0); Index: src/sys/arch/arm/xscale/becc_space.c diff -u src/sys/arch/arm/xscale/becc_space.c:1.4 src/sys/arch/arm/xscale/becc_space.c:1.5 --- src/sys/arch/arm/xscale/becc_space.c:1.4 Sun Dec 11 12:16:51 2005 +++ src/sys/arch/arm/xscale/becc_space.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: becc_space.c,v 1.4 2005/12/11 12:16:51 christos Exp $ */ +/* $NetBSD: becc_space.c,v 1.5 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -40,14 +40,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: becc_space.c,v 1.4 2005/12/11 12:16:51 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: becc_space.c,v 1.5 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <uvm/uvm_extern.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/beccreg.h> #include <arm/xscale/beccvar.h> Index: src/sys/arch/arm/xscale/i80312_i2c.c diff -u src/sys/arch/arm/xscale/i80312_i2c.c:1.4 src/sys/arch/arm/xscale/i80312_i2c.c:1.5 --- src/sys/arch/arm/xscale/i80312_i2c.c:1.4 Thu Dec 6 17:00:32 2007 +++ src/sys/arch/arm/xscale/i80312_i2c.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: i80312_i2c.c,v 1.4 2007/12/06 17:00:32 ad Exp $ */ +/* $NetBSD: i80312_i2c.c,v 1.5 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i80312_i2c.c,v 1.4 2007/12/06 17:00:32 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i80312_i2c.c,v 1.5 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/mutex.h> @@ -48,7 +48,7 @@ #include <sys/device.h> #include <sys/kernel.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/intr.h> #include <arm/xscale/i80312var.h> Index: src/sys/arch/arm/xscale/i80312_mem.c diff -u src/sys/arch/arm/xscale/i80312_mem.c:1.4 src/sys/arch/arm/xscale/i80312_mem.c:1.5 --- src/sys/arch/arm/xscale/i80312_mem.c:1.4 Sun Dec 11 12:16:51 2005 +++ src/sys/arch/arm/xscale/i80312_mem.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: i80312_mem.c,v 1.4 2005/12/11 12:16:51 christos Exp $ */ +/* $NetBSD: i80312_mem.c,v 1.5 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -40,12 +40,12 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i80312_mem.c,v 1.4 2005/12/11 12:16:51 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i80312_mem.c,v 1.5 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/i80312reg.h> #include <arm/xscale/i80312var.h> Index: src/sys/arch/arm/xscale/ixp425_pci_dma.c diff -u src/sys/arch/arm/xscale/ixp425_pci_dma.c:1.4 src/sys/arch/arm/xscale/ixp425_pci_dma.c:1.5 --- src/sys/arch/arm/xscale/ixp425_pci_dma.c:1.4 Wed Oct 21 14:15:50 2009 +++ src/sys/arch/arm/xscale/ixp425_pci_dma.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ixp425_pci_dma.c,v 1.4 2009/10/21 14:15:50 rmind Exp $ */ +/* $NetBSD: ixp425_pci_dma.c,v 1.5 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2003 @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ixp425_pci_dma.c,v 1.4 2009/10/21 14:15:50 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixp425_pci_dma.c,v 1.5 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -39,7 +39,7 @@ #include <uvm/uvm_extern.h> #define _ARM32_BUS_DMA_PRIVATE -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/ixp425reg.h> #include <arm/xscale/ixp425var.h> Index: src/sys/arch/arm/xscale/pxa2x0_a4x_space.c diff -u src/sys/arch/arm/xscale/pxa2x0_a4x_space.c:1.4 src/sys/arch/arm/xscale/pxa2x0_a4x_space.c:1.5 --- src/sys/arch/arm/xscale/pxa2x0_a4x_space.c:1.4 Fri Jul 28 08:15:29 2006 +++ src/sys/arch/arm/xscale/pxa2x0_a4x_space.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pxa2x0_a4x_space.c,v 1.4 2006/07/28 08:15:29 simonb Exp $ */ +/* $NetBSD: pxa2x0_a4x_space.c,v 1.5 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2002 Genetec Corporation. All rights reserved. @@ -39,14 +39,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pxa2x0_a4x_space.c,v 1.4 2006/07/28 08:15:29 simonb Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pxa2x0_a4x_space.c,v 1.5 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <uvm/uvm_extern.h> -#include <machine/bus.h> +#include <sys/bus.h> /* Prototypes for all the bus_space structure functions */ bs_protos(pxa2x0); Index: src/sys/arch/arm/xscale/pxa2x0_dma.c diff -u src/sys/arch/arm/xscale/pxa2x0_dma.c:1.4 src/sys/arch/arm/xscale/pxa2x0_dma.c:1.5 --- src/sys/arch/arm/xscale/pxa2x0_dma.c:1.4 Sun Dec 11 12:16:51 2005 +++ src/sys/arch/arm/xscale/pxa2x0_dma.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pxa2x0_dma.c,v 1.4 2005/12/11 12:16:51 christos Exp $ */ +/* $NetBSD: pxa2x0_dma.c,v 1.5 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2002 Genetec Corporation. All rights reserved. @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pxa2x0_dma.c,v 1.4 2005/12/11 12:16:51 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pxa2x0_dma.c,v 1.5 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -50,7 +50,7 @@ #include <uvm/uvm_extern.h> #define _ARM32_BUS_DMA_PRIVATE -#include <machine/bus.h> +#include <sys/bus.h> struct arm32_bus_dma_tag pxa2x0_bus_dma_tag = { 0, Index: src/sys/arch/arm/xscale/pxa2x0_rtc.c diff -u src/sys/arch/arm/xscale/pxa2x0_rtc.c:1.4 src/sys/arch/arm/xscale/pxa2x0_rtc.c:1.5 --- src/sys/arch/arm/xscale/pxa2x0_rtc.c:1.4 Sat May 14 15:01:50 2011 +++ src/sys/arch/arm/xscale/pxa2x0_rtc.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pxa2x0_rtc.c,v 1.4 2011/05/14 15:01:50 nonaka Exp $ */ +/* $NetBSD: pxa2x0_rtc.c,v 1.5 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2007 NONAKA Kimihiro <non...@netbsd.org> @@ -22,7 +22,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pxa2x0_rtc.c,v 1.4 2011/05/14 15:01:50 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pxa2x0_rtc.c,v 1.5 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -31,7 +31,7 @@ #include <dev/clock_subr.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/pxa2x0cpu.h> #include <arm/xscale/pxa2x0reg.h> Index: src/sys/arch/arm/xscale/pxa2x0_udc.c diff -u src/sys/arch/arm/xscale/pxa2x0_udc.c:1.4 src/sys/arch/arm/xscale/pxa2x0_udc.c:1.5 --- src/sys/arch/arm/xscale/pxa2x0_udc.c:1.4 Thu Jun 9 17:29:42 2011 +++ src/sys/arch/arm/xscale/pxa2x0_udc.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pxa2x0_udc.c,v 1.4 2011/06/09 17:29:42 nonaka Exp $ */ +/* $NetBSD: pxa2x0_udc.c,v 1.5 2011/07/01 20:32:51 dyoung Exp $ */ /* $OpenBSD: pxa27x_udc.c,v 1.5 2005/03/30 14:24:39 dlg Exp $ */ /* @@ -23,7 +23,7 @@ #include <sys/kernel.h> #include <machine/intr.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/pxa2x0cpu.h> #include <arm/xscale/pxa2x0reg.h> Index: src/sys/arch/arm/xscale/becc_timer.c diff -u src/sys/arch/arm/xscale/becc_timer.c:1.14 src/sys/arch/arm/xscale/becc_timer.c:1.15 --- src/sys/arch/arm/xscale/becc_timer.c:1.14 Sun Jan 20 16:28:24 2008 +++ src/sys/arch/arm/xscale/becc_timer.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: becc_timer.c,v 1.14 2008/01/20 16:28:24 joerg Exp $ */ +/* $NetBSD: becc_timer.c,v 1.15 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: becc_timer.c,v 1.14 2008/01/20 16:28:24 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: becc_timer.c,v 1.15 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -51,7 +51,7 @@ #include <dev/clock_subr.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/cpufunc.h> #include <arm/xscale/beccreg.h> Index: src/sys/arch/arm/xscale/ixp425.c diff -u src/sys/arch/arm/xscale/ixp425.c:1.14 src/sys/arch/arm/xscale/ixp425.c:1.15 --- src/sys/arch/arm/xscale/ixp425.c:1.14 Tue May 17 17:34:48 2011 +++ src/sys/arch/arm/xscale/ixp425.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ixp425.c,v 1.14 2011/05/17 17:34:48 dyoung Exp $ */ +/* $NetBSD: ixp425.c,v 1.15 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2003 @@ -30,14 +30,14 @@ #include "pci.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ixp425.c,v 1.14 2011/05/17 17:34:48 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixp425.c,v 1.15 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> #include <uvm/uvm.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/ixp425reg.h> #include <arm/xscale/ixp425var.h> Index: src/sys/arch/arm/xscale/pxa2x0_gpio.c diff -u src/sys/arch/arm/xscale/pxa2x0_gpio.c:1.14 src/sys/arch/arm/xscale/pxa2x0_gpio.c:1.15 --- src/sys/arch/arm/xscale/pxa2x0_gpio.c:1.14 Thu Jun 9 17:29:42 2011 +++ src/sys/arch/arm/xscale/pxa2x0_gpio.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pxa2x0_gpio.c,v 1.14 2011/06/09 17:29:42 nonaka Exp $ */ +/* $NetBSD: pxa2x0_gpio.c,v 1.15 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright 2003 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pxa2x0_gpio.c,v 1.14 2011/06/09 17:29:42 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pxa2x0_gpio.c,v 1.15 2011/07/01 20:32:51 dyoung Exp $"); #include "opt_pxa2x0_gpio.h" @@ -46,7 +46,7 @@ #include <sys/malloc.h> #include <machine/intr.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/pxa2x0cpu.h> #include <arm/xscale/pxa2x0reg.h> Index: src/sys/arch/arm/xscale/i80312.c diff -u src/sys/arch/arm/xscale/i80312.c:1.20 src/sys/arch/arm/xscale/i80312.c:1.21 --- src/sys/arch/arm/xscale/i80312.c:1.20 Tue May 17 17:34:48 2011 +++ src/sys/arch/arm/xscale/i80312.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: i80312.c,v 1.20 2011/05/17 17:34:48 dyoung Exp $ */ +/* $NetBSD: i80312.c,v 1.21 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -40,14 +40,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i80312.c,v 1.20 2011/05/17 17:34:48 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i80312.c,v 1.21 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> #define _ARM32_BUS_DMA_PRIVATE -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/i80312reg.h> #include <arm/xscale/i80312var.h> Index: src/sys/arch/arm/xscale/i80312_gpio.c diff -u src/sys/arch/arm/xscale/i80312_gpio.c:1.3 src/sys/arch/arm/xscale/i80312_gpio.c:1.4 --- src/sys/arch/arm/xscale/i80312_gpio.c:1.3 Sun Dec 11 12:16:51 2005 +++ src/sys/arch/arm/xscale/i80312_gpio.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: i80312_gpio.c,v 1.3 2005/12/11 12:16:51 christos Exp $ */ +/* $NetBSD: i80312_gpio.c,v 1.4 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -40,12 +40,12 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i80312_gpio.c,v 1.3 2005/12/11 12:16:51 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i80312_gpio.c,v 1.4 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/i80312reg.h> #include <arm/xscale/i80312var.h> Index: src/sys/arch/arm/xscale/i80321_i2c.c diff -u src/sys/arch/arm/xscale/i80321_i2c.c:1.3 src/sys/arch/arm/xscale/i80321_i2c.c:1.4 --- src/sys/arch/arm/xscale/i80321_i2c.c:1.3 Thu Dec 6 17:00:32 2007 +++ src/sys/arch/arm/xscale/i80321_i2c.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: i80321_i2c.c,v 1.3 2007/12/06 17:00:32 ad Exp $ */ +/* $NetBSD: i80321_i2c.c,v 1.4 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i80321_i2c.c,v 1.3 2007/12/06 17:00:32 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i80321_i2c.c,v 1.4 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/mutex.h> @@ -48,7 +48,7 @@ #include <sys/device.h> #include <sys/kernel.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/intr.h> #include <arm/xscale/i80321reg.h> Index: src/sys/arch/arm/xscale/i80321_mcu.c diff -u src/sys/arch/arm/xscale/i80321_mcu.c:1.3 src/sys/arch/arm/xscale/i80321_mcu.c:1.4 --- src/sys/arch/arm/xscale/i80321_mcu.c:1.3 Sun Dec 11 12:16:51 2005 +++ src/sys/arch/arm/xscale/i80321_mcu.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: i80321_mcu.c,v 1.3 2005/12/11 12:16:51 christos Exp $ */ +/* $NetBSD: i80321_mcu.c,v 1.4 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -40,12 +40,12 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i80321_mcu.c,v 1.3 2005/12/11 12:16:51 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i80321_mcu.c,v 1.4 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/i80321reg.h> #include <arm/xscale/i80321var.h> Index: src/sys/arch/arm/xscale/i80312_space.c diff -u src/sys/arch/arm/xscale/i80312_space.c:1.10 src/sys/arch/arm/xscale/i80312_space.c:1.11 --- src/sys/arch/arm/xscale/i80312_space.c:1.10 Wed Feb 24 19:12:12 2010 +++ src/sys/arch/arm/xscale/i80312_space.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: i80312_space.c,v 1.10 2010/02/24 19:12:12 skrll Exp $ */ +/* $NetBSD: i80312_space.c,v 1.11 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -40,14 +40,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i80312_space.c,v 1.10 2010/02/24 19:12:12 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i80312_space.c,v 1.11 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <uvm/uvm_extern.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/i80312reg.h> #include <arm/xscale/i80312var.h> Index: src/sys/arch/arm/xscale/i80321.c diff -u src/sys/arch/arm/xscale/i80321.c:1.21 src/sys/arch/arm/xscale/i80321.c:1.22 --- src/sys/arch/arm/xscale/i80321.c:1.21 Tue May 17 17:34:48 2011 +++ src/sys/arch/arm/xscale/i80321.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: i80321.c,v 1.21 2011/05/17 17:34:48 dyoung Exp $ */ +/* $NetBSD: i80321.c,v 1.22 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2002 Wasabi Systems, Inc. @@ -40,14 +40,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i80321.c,v 1.21 2011/05/17 17:34:48 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i80321.c,v 1.22 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> #define _ARM32_BUS_DMA_PRIVATE -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/i80321reg.h> #include <arm/xscale/i80321var.h> Index: src/sys/arch/arm/xscale/i80321_icu.c diff -u src/sys/arch/arm/xscale/i80321_icu.c:1.21 src/sys/arch/arm/xscale/i80321_icu.c:1.22 --- src/sys/arch/arm/xscale/i80321_icu.c:1.21 Mon Dec 20 00:25:29 2010 +++ src/sys/arch/arm/xscale/i80321_icu.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: i80321_icu.c,v 1.21 2010/12/20 00:25:29 matt Exp $ */ +/* $NetBSD: i80321_icu.c,v 1.22 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2001, 2002, 2006 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i80321_icu.c,v 1.21 2010/12/20 00:25:29 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i80321_icu.c,v 1.22 2011/07/01 20:32:51 dyoung Exp $"); #ifndef EVBARM_SPL_NOINLINE #define EVBARM_SPL_NOINLINE @@ -52,7 +52,7 @@ #include <uvm/uvm_extern.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/intr.h> #include <arm/cpufunc.h> Index: src/sys/arch/arm/xscale/i80321_gpio.c diff -u src/sys/arch/arm/xscale/i80321_gpio.c:1.2 src/sys/arch/arm/xscale/i80321_gpio.c:1.3 --- src/sys/arch/arm/xscale/i80321_gpio.c:1.2 Sun Dec 11 12:16:51 2005 +++ src/sys/arch/arm/xscale/i80321_gpio.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: i80321_gpio.c,v 1.2 2005/12/11 12:16:51 christos Exp $ */ +/* $NetBSD: i80321_gpio.c,v 1.3 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2001, 2003 Wasabi Systems, Inc. @@ -42,7 +42,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/i80321reg.h> #include <arm/xscale/i80321var.h> Index: src/sys/arch/arm/xscale/ixp425_a4x_space.c diff -u src/sys/arch/arm/xscale/ixp425_a4x_space.c:1.2 src/sys/arch/arm/xscale/ixp425_a4x_space.c:1.3 --- src/sys/arch/arm/xscale/ixp425_a4x_space.c:1.2 Sun Dec 11 12:16:51 2005 +++ src/sys/arch/arm/xscale/ixp425_a4x_space.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ixp425_a4x_space.c,v 1.2 2005/12/11 12:16:51 christos Exp $ */ +/* $NetBSD: ixp425_a4x_space.c,v 1.3 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright 2003 Wasabi Systems, Inc. @@ -43,14 +43,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ixp425_a4x_space.c,v 1.2 2005/12/11 12:16:51 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixp425_a4x_space.c,v 1.3 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <uvm/uvm_extern.h> -#include <machine/bus.h> +#include <sys/bus.h> /* Prototypes for all the bus_space structure functions */ bs_protos(ixp425); Index: src/sys/arch/arm/xscale/ixp425_ixme.c diff -u src/sys/arch/arm/xscale/ixp425_ixme.c:1.2 src/sys/arch/arm/xscale/ixp425_ixme.c:1.3 --- src/sys/arch/arm/xscale/ixp425_ixme.c:1.2 Mon Apr 28 20:23:14 2008 +++ src/sys/arch/arm/xscale/ixp425_ixme.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ixp425_ixme.c,v 1.2 2008/04/28 20:23:14 martin Exp $ */ +/* $NetBSD: ixp425_ixme.c,v 1.3 2011/07/01 20:32:51 dyoung Exp $ */ /*- * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ixp425_ixme.c,v 1.2 2008/04/28 20:23:14 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixp425_ixme.c,v 1.3 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -38,7 +38,7 @@ #include <sys/device.h> #define _ARM32_BUS_DMA_PRIVATE -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/ixp425var.h> #include <arm/xscale/ixp425_qmgr.h> Index: src/sys/arch/arm/xscale/ixp425_wdog.c diff -u src/sys/arch/arm/xscale/ixp425_wdog.c:1.2 src/sys/arch/arm/xscale/ixp425_wdog.c:1.3 --- src/sys/arch/arm/xscale/ixp425_wdog.c:1.2 Mon Apr 28 20:23:14 2008 +++ src/sys/arch/arm/xscale/ixp425_wdog.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ixp425_wdog.c,v 1.2 2008/04/28 20:23:14 martin Exp $ */ +/* $NetBSD: ixp425_wdog.c,v 1.3 2011/07/01 20:32:51 dyoung Exp $ */ /*- * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #include "opt_ddb.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ixp425_wdog.c,v 1.2 2008/04/28 20:23:14 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixp425_wdog.c,v 1.3 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/systm.h> #include <sys/param.h> @@ -44,7 +44,7 @@ #include <dev/sysmon/sysmonvar.h> #include <machine/intr.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/ixp425reg.h> #include <arm/xscale/ixp425var.h> Index: src/sys/arch/arm/xscale/i80321_space.c diff -u src/sys/arch/arm/xscale/i80321_space.c:1.12 src/sys/arch/arm/xscale/i80321_space.c:1.13 --- src/sys/arch/arm/xscale/i80321_space.c:1.12 Wed Feb 24 19:12:12 2010 +++ src/sys/arch/arm/xscale/i80321_space.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: i80321_space.c,v 1.12 2010/02/24 19:12:12 skrll Exp $ */ +/* $NetBSD: i80321_space.c,v 1.13 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -40,14 +40,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i80321_space.c,v 1.12 2010/02/24 19:12:12 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i80321_space.c,v 1.13 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <uvm/uvm_extern.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/i80321reg.h> #include <arm/xscale/i80321var.h> Index: src/sys/arch/arm/xscale/ixp425var.h diff -u src/sys/arch/arm/xscale/ixp425var.h:1.12 src/sys/arch/arm/xscale/ixp425var.h:1.13 --- src/sys/arch/arm/xscale/ixp425var.h:1.12 Wed Oct 21 14:15:51 2009 +++ src/sys/arch/arm/xscale/ixp425var.h Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ixp425var.h,v 1.12 2009/10/21 14:15:51 rmind Exp $ */ +/* $NetBSD: ixp425var.h,v 1.13 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2003 @@ -34,7 +34,7 @@ #include <sys/device.h> #include <sys/queue.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <dev/pci/pcivar.h> Index: src/sys/arch/arm/xscale/pxa2x0_com.c diff -u src/sys/arch/arm/xscale/pxa2x0_com.c:1.12 src/sys/arch/arm/xscale/pxa2x0_com.c:1.13 --- src/sys/arch/arm/xscale/pxa2x0_com.c:1.12 Sun Dec 6 12:27:33 2009 +++ src/sys/arch/arm/xscale/pxa2x0_com.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pxa2x0_com.c,v 1.12 2009/12/06 12:27:33 kiyohara Exp $ */ +/* $NetBSD: pxa2x0_com.c,v 1.13 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright 2003 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pxa2x0_com.c,v 1.12 2009/12/06 12:27:33 kiyohara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pxa2x0_com.c,v 1.13 2011/07/01 20:32:51 dyoung Exp $"); #include "opt_com.h" @@ -50,7 +50,7 @@ #include <sys/termios.h> #include <machine/intr.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <dev/ic/comreg.h> #include <dev/ic/comvar.h> Index: src/sys/arch/arm/xscale/i80321_timer.c diff -u src/sys/arch/arm/xscale/i80321_timer.c:1.19 src/sys/arch/arm/xscale/i80321_timer.c:1.20 --- src/sys/arch/arm/xscale/i80321_timer.c:1.19 Sun Apr 27 18:58:45 2008 +++ src/sys/arch/arm/xscale/i80321_timer.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: i80321_timer.c,v 1.19 2008/04/27 18:58:45 matt Exp $ */ +/* $NetBSD: i80321_timer.c,v 1.20 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i80321_timer.c,v 1.19 2008/04/27 18:58:45 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i80321_timer.c,v 1.20 2011/07/01 20:32:51 dyoung Exp $"); #include "opt_perfctrs.h" #include "opt_i80321.h" @@ -53,7 +53,7 @@ #include <dev/clock_subr.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/cpufunc.h> #include <arm/xscale/i80321reg.h> Index: src/sys/arch/arm/xscale/ixp425_if_npe.c diff -u src/sys/arch/arm/xscale/ixp425_if_npe.c:1.19 src/sys/arch/arm/xscale/ixp425_if_npe.c:1.20 --- src/sys/arch/arm/xscale/ixp425_if_npe.c:1.19 Mon Apr 5 07:19:29 2010 +++ src/sys/arch/arm/xscale/ixp425_if_npe.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ixp425_if_npe.c,v 1.19 2010/04/05 07:19:29 joerg Exp $ */ +/* $NetBSD: ixp425_if_npe.c,v 1.20 2011/07/01 20:32:51 dyoung Exp $ */ /*- * Copyright (c) 2006 Sam Leffler. All rights reserved. @@ -28,7 +28,7 @@ #if 0 __FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.1 2006/11/19 23:55:23 sam Exp $"); #endif -__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.19 2010/04/05 07:19:29 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.20 2011/07/01 20:32:51 dyoung Exp $"); /* * Intel XScale NPE Ethernet driver. @@ -61,7 +61,7 @@ #include <sys/ioctl.h> #include <sys/syslog.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <net/if.h> #include <net/if_dl.h> Index: src/sys/arch/arm/xscale/pxa2x0.c diff -u src/sys/arch/arm/xscale/pxa2x0.c:1.19 src/sys/arch/arm/xscale/pxa2x0.c:1.20 --- src/sys/arch/arm/xscale/pxa2x0.c:1.19 Thu Jun 9 17:29:42 2011 +++ src/sys/arch/arm/xscale/pxa2x0.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pxa2x0.c,v 1.19 2011/06/09 17:29:42 nonaka Exp $ */ +/* $NetBSD: pxa2x0.c,v 1.20 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2002, 2005 Genetec Corporation. All rights reserved. @@ -99,7 +99,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pxa2x0.c,v 1.19 2011/06/09 17:29:42 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pxa2x0.c,v 1.20 2011/07/01 20:32:51 dyoung Exp $"); #include "pxaintc.h" #include "pxagpio.h" @@ -116,7 +116,7 @@ #include <sys/reboot.h> #include <machine/cpu.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/cpufunc.h> #include <arm/mainbus/mainbus.h> Index: src/sys/arch/arm/xscale/i80321_wdog.c diff -u src/sys/arch/arm/xscale/i80321_wdog.c:1.8 src/sys/arch/arm/xscale/i80321_wdog.c:1.9 --- src/sys/arch/arm/xscale/i80321_wdog.c:1.8 Sat Dec 24 20:06:52 2005 +++ src/sys/arch/arm/xscale/i80321_wdog.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: i80321_wdog.c,v 1.8 2005/12/24 20:06:52 perry Exp $ */ +/* $NetBSD: i80321_wdog.c,v 1.9 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2002 Wasabi Systems, Inc. @@ -40,14 +40,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i80321_wdog.c,v 1.8 2005/12/24 20:06:52 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i80321_wdog.c,v 1.9 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> #include <sys/wdog.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/cpufunc.h> #include <arm/xscale/i80321reg.h> Index: src/sys/arch/arm/xscale/ixp425_pci_space.c diff -u src/sys/arch/arm/xscale/ixp425_pci_space.c:1.8 src/sys/arch/arm/xscale/ixp425_pci_space.c:1.9 --- src/sys/arch/arm/xscale/ixp425_pci_space.c:1.8 Sat Nov 7 07:27:42 2009 +++ src/sys/arch/arm/xscale/ixp425_pci_space.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ixp425_pci_space.c,v 1.8 2009/11/07 07:27:42 cegger Exp $ */ +/* $NetBSD: ixp425_pci_space.c,v 1.9 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2003 @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ixp425_pci_space.c,v 1.8 2009/11/07 07:27:42 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixp425_pci_space.c,v 1.9 2011/07/01 20:32:51 dyoung Exp $"); /* * bus_space PCI functions for ixp425 @@ -40,7 +40,7 @@ #include <uvm/uvm.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/ixp425reg.h> #include <arm/xscale/ixp425var.h> Index: src/sys/arch/arm/xscale/pxa2x0_ac97.c diff -u src/sys/arch/arm/xscale/pxa2x0_ac97.c:1.8 src/sys/arch/arm/xscale/pxa2x0_ac97.c:1.9 --- src/sys/arch/arm/xscale/pxa2x0_ac97.c:1.8 Thu Jun 9 17:29:42 2011 +++ src/sys/arch/arm/xscale/pxa2x0_ac97.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pxa2x0_ac97.c,v 1.8 2011/06/09 17:29:42 nonaka Exp $ */ +/* $NetBSD: pxa2x0_ac97.c,v 1.9 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2003, 2005 Wasabi Systems, Inc. @@ -44,7 +44,7 @@ #include <sys/audioio.h> #include <machine/intr.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <dev/audio_if.h> #include <dev/audiovar.h> Index: src/sys/arch/arm/xscale/pxa2x0_i2s.c diff -u src/sys/arch/arm/xscale/pxa2x0_i2s.c:1.8 src/sys/arch/arm/xscale/pxa2x0_i2s.c:1.9 --- src/sys/arch/arm/xscale/pxa2x0_i2s.c:1.8 Fri Mar 13 13:55:18 2009 +++ src/sys/arch/arm/xscale/pxa2x0_i2s.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pxa2x0_i2s.c,v 1.8 2009/03/13 13:55:18 nonaka Exp $ */ +/* $NetBSD: pxa2x0_i2s.c,v 1.9 2011/07/01 20:32:51 dyoung Exp $ */ /* $OpenBSD: pxa2x0_i2s.c,v 1.7 2006/04/04 11:45:40 pascoe Exp $ */ /* @@ -18,14 +18,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pxa2x0_i2s.c,v 1.8 2009/03/13 13:55:18 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pxa2x0_i2s.c,v 1.9 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> #include <sys/malloc.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/pxa2x0reg.h> #include <arm/xscale/pxa2x0var.h> Index: src/sys/arch/arm/xscale/pxa2x0_pcic.c diff -u src/sys/arch/arm/xscale/pxa2x0_pcic.c:1.8 src/sys/arch/arm/xscale/pxa2x0_pcic.c:1.9 --- src/sys/arch/arm/xscale/pxa2x0_pcic.c:1.8 Mon Mar 2 10:17:58 2009 +++ src/sys/arch/arm/xscale/pxa2x0_pcic.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pxa2x0_pcic.c,v 1.8 2009/03/02 10:17:58 nonaka Exp $ */ +/* $NetBSD: pxa2x0_pcic.c,v 1.9 2011/07/01 20:32:51 dyoung Exp $ */ /* $OpenBSD: pxa2x0_pcic.c,v 1.17 2005/12/14 15:08:51 uwe Exp $ */ /* @@ -18,7 +18,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pxa2x0_pcic.c,v 1.8 2009/03/02 10:17:58 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pxa2x0_pcic.c,v 1.9 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -29,7 +29,7 @@ #include <uvm/uvm.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/intr.h> #include <dev/pcmcia/pcmciareg.h> Index: src/sys/arch/arm/xscale/iopi2c.c diff -u src/sys/arch/arm/xscale/iopi2c.c:1.5 src/sys/arch/arm/xscale/iopi2c.c:1.6 --- src/sys/arch/arm/xscale/iopi2c.c:1.5 Thu Dec 6 17:00:32 2007 +++ src/sys/arch/arm/xscale/iopi2c.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: iopi2c.c,v 1.5 2007/12/06 17:00:32 ad Exp $ */ +/* $NetBSD: iopi2c.c,v 1.6 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: iopi2c.c,v 1.5 2007/12/06 17:00:32 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iopi2c.c,v 1.6 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/mutex.h> @@ -48,7 +48,7 @@ #include <sys/device.h> #include <sys/kernel.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/intr.h> #include <dev/i2c/i2cvar.h> Index: src/sys/arch/arm/xscale/ixp425_sipvar.h diff -u src/sys/arch/arm/xscale/ixp425_sipvar.h:1.5 src/sys/arch/arm/xscale/ixp425_sipvar.h:1.6 --- src/sys/arch/arm/xscale/ixp425_sipvar.h:1.5 Wed Oct 21 14:15:50 2009 +++ src/sys/arch/arm/xscale/ixp425_sipvar.h Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ixp425_sipvar.h,v 1.5 2009/10/21 14:15:50 rmind Exp $ */ +/* $NetBSD: ixp425_sipvar.h,v 1.6 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2003 * Ichiro FUKUHARA <ich...@ichiro.org>. @@ -33,7 +33,7 @@ #include <sys/device.h> #include <sys/queue.h> -#include <machine/bus.h> +#include <sys/bus.h> struct ixpsip_softc { struct device sc_dev; Index: src/sys/arch/arm/xscale/ixp425_com.c diff -u src/sys/arch/arm/xscale/ixp425_com.c:1.17 src/sys/arch/arm/xscale/ixp425_com.c:1.18 --- src/sys/arch/arm/xscale/ixp425_com.c:1.17 Fri Mar 14 15:09:09 2008 +++ src/sys/arch/arm/xscale/ixp425_com.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ixp425_com.c,v 1.17 2008/03/14 15:09:09 cube Exp $ */ +/* $NetBSD: ixp425_com.c,v 1.18 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright 2003 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ixp425_com.c,v 1.17 2008/03/14 15:09:09 cube Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixp425_com.c,v 1.18 2011/07/01 20:32:51 dyoung Exp $"); #include "opt_com.h" #ifndef COM_PXA2X0 @@ -49,7 +49,7 @@ #include <sys/termios.h> #include <machine/intr.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <dev/ic/comreg.h> #include <dev/ic/comvar.h> Index: src/sys/arch/arm/xscale/ixp425_intr.c diff -u src/sys/arch/arm/xscale/ixp425_intr.c:1.22 src/sys/arch/arm/xscale/ixp425_intr.c:1.23 --- src/sys/arch/arm/xscale/ixp425_intr.c:1.22 Mon Dec 20 00:25:29 2010 +++ src/sys/arch/arm/xscale/ixp425_intr.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ixp425_intr.c,v 1.22 2010/12/20 00:25:29 matt Exp $ */ +/* $NetBSD: ixp425_intr.c,v 1.23 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2003 @@ -62,7 +62,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ixp425_intr.c,v 1.22 2010/12/20 00:25:29 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixp425_intr.c,v 1.23 2011/07/01 20:32:51 dyoung Exp $"); #ifndef EVBARM_SPL_NOINLINE #define EVBARM_SPL_NOINLINE @@ -76,7 +76,7 @@ #include <sys/systm.h> #include <sys/malloc.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/intr.h> #include <arm/cpufunc.h> Index: src/sys/arch/arm/xscale/ixp425_npe.c diff -u src/sys/arch/arm/xscale/ixp425_npe.c:1.7 src/sys/arch/arm/xscale/ixp425_npe.c:1.8 --- src/sys/arch/arm/xscale/ixp425_npe.c:1.7 Fri May 13 22:28:40 2011 +++ src/sys/arch/arm/xscale/ixp425_npe.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ixp425_npe.c,v 1.7 2011/05/13 22:28:40 rmind Exp $ */ +/* $NetBSD: ixp425_npe.c,v 1.8 2011/07/01 20:32:51 dyoung Exp $ */ /*- * Copyright (c) 2006 Sam Leffler, Errno Consulting @@ -62,7 +62,7 @@ #if 0 __FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npe.c,v 1.1 2006/11/19 23:55:23 sam Exp $"); #endif -__KERNEL_RCSID(0, "$NetBSD: ixp425_npe.c,v 1.7 2011/05/13 22:28:40 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixp425_npe.c,v 1.8 2011/07/01 20:32:51 dyoung Exp $"); /* * Intel XScale Network Processing Engine (NPE) support. @@ -92,7 +92,7 @@ #include <dev/firmload.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/cpu.h> #include <machine/intr.h> Index: src/sys/arch/arm/xscale/ixp425_space.c diff -u src/sys/arch/arm/xscale/ixp425_space.c:1.7 src/sys/arch/arm/xscale/ixp425_space.c:1.8 --- src/sys/arch/arm/xscale/ixp425_space.c:1.7 Wed Oct 21 14:15:51 2009 +++ src/sys/arch/arm/xscale/ixp425_space.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ixp425_space.c,v 1.7 2009/10/21 14:15:51 rmind Exp $ */ +/* $NetBSD: ixp425_space.c,v 1.8 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2003 @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ixp425_space.c,v 1.7 2009/10/21 14:15:51 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixp425_space.c,v 1.8 2011/07/01 20:32:51 dyoung Exp $"); /* * bus_space I/O functions for ixp425 @@ -40,7 +40,7 @@ #include <uvm/uvm.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/ixp425reg.h> #include <arm/xscale/ixp425var.h> Index: src/sys/arch/arm/xscale/pxa2x0_dmac.c diff -u src/sys/arch/arm/xscale/pxa2x0_dmac.c:1.7 src/sys/arch/arm/xscale/pxa2x0_dmac.c:1.8 --- src/sys/arch/arm/xscale/pxa2x0_dmac.c:1.7 Thu Jun 9 17:29:42 2011 +++ src/sys/arch/arm/xscale/pxa2x0_dmac.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pxa2x0_dmac.c,v 1.7 2011/06/09 17:29:42 nonaka Exp $ */ +/* $NetBSD: pxa2x0_dmac.c,v 1.8 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2003, 2005 Wasabi Systems, Inc. @@ -47,7 +47,7 @@ #include <uvm/uvm_param.h> /* For PAGE_SIZE */ #include <machine/intr.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <dev/dmover/dmovervar.h> Index: src/sys/arch/arm/xscale/pxa2x0_ohci.c diff -u src/sys/arch/arm/xscale/pxa2x0_ohci.c:1.7 src/sys/arch/arm/xscale/pxa2x0_ohci.c:1.8 --- src/sys/arch/arm/xscale/pxa2x0_ohci.c:1.7 Mon Aug 10 23:08:12 2009 +++ src/sys/arch/arm/xscale/pxa2x0_ohci.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pxa2x0_ohci.c,v 1.7 2009/08/10 23:08:12 kiyohara Exp $ */ +/* $NetBSD: pxa2x0_ohci.c,v 1.8 2011/07/01 20:32:51 dyoung Exp $ */ /* $OpenBSD: pxa2x0_ohci.c,v 1.19 2005/04/08 02:32:54 dlg Exp $ */ /* @@ -23,7 +23,7 @@ #include <sys/kernel.h> #include <machine/intr.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> Index: src/sys/arch/arm/xscale/ixp425_pci.c diff -u src/sys/arch/arm/xscale/ixp425_pci.c:1.6 src/sys/arch/arm/xscale/ixp425_pci.c:1.7 --- src/sys/arch/arm/xscale/ixp425_pci.c:1.6 Wed Oct 21 14:15:50 2009 +++ src/sys/arch/arm/xscale/ixp425_pci.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ixp425_pci.c,v 1.6 2009/10/21 14:15:50 rmind Exp $ */ +/* $NetBSD: ixp425_pci.c,v 1.7 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2003 @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ixp425_pci.c,v 1.6 2009/10/21 14:15:50 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixp425_pci.c,v 1.7 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -38,7 +38,7 @@ #include <uvm/uvm_extern.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/ixp425reg.h> #include <arm/xscale/ixp425var.h> Index: src/sys/arch/arm/xscale/ixp425_qmgr.c diff -u src/sys/arch/arm/xscale/ixp425_qmgr.c:1.6 src/sys/arch/arm/xscale/ixp425_qmgr.c:1.7 --- src/sys/arch/arm/xscale/ixp425_qmgr.c:1.6 Thu Mar 5 01:48:58 2009 +++ src/sys/arch/arm/xscale/ixp425_qmgr.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ixp425_qmgr.c,v 1.6 2009/03/05 01:48:58 msaitoh Exp $ */ +/* $NetBSD: ixp425_qmgr.c,v 1.7 2011/07/01 20:32:51 dyoung Exp $ */ /*- * Copyright (c) 2006 Sam Leffler, Errno Consulting @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> /*__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.c,v 1.1 2006/11/19 23:55:23 sam Exp $");*/ -__KERNEL_RCSID(0, "$NetBSD: ixp425_qmgr.c,v 1.6 2009/03/05 01:48:58 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixp425_qmgr.c,v 1.7 2011/07/01 20:32:51 dyoung Exp $"); /* * Intel XScale Queue Manager support. @@ -83,7 +83,7 @@ #include <sys/malloc.h> #include <sys/resource.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/cpu.h> #include <machine/intr.h> Index: src/sys/arch/arm/xscale/ixp425_sip.c diff -u src/sys/arch/arm/xscale/ixp425_sip.c:1.11 src/sys/arch/arm/xscale/ixp425_sip.c:1.12 --- src/sys/arch/arm/xscale/ixp425_sip.c:1.11 Wed Oct 21 14:15:50 2009 +++ src/sys/arch/arm/xscale/ixp425_sip.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ixp425_sip.c,v 1.11 2009/10/21 14:15:50 rmind Exp $ */ +/* $NetBSD: ixp425_sip.c,v 1.12 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2003 @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ixp425_sip.c,v 1.11 2009/10/21 14:15:50 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixp425_sip.c,v 1.12 2011/07/01 20:32:51 dyoung Exp $"); /* * Slow peripheral bus of IXP425 Processor @@ -39,7 +39,7 @@ #include <sys/device.h> #include <machine/autoconf.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/ixp425var.h> #include <arm/xscale/ixp425_sipvar.h> Index: src/sys/arch/arm/xscale/ixp425_timer.c diff -u src/sys/arch/arm/xscale/ixp425_timer.c:1.15 src/sys/arch/arm/xscale/ixp425_timer.c:1.16 --- src/sys/arch/arm/xscale/ixp425_timer.c:1.15 Wed Oct 21 14:15:51 2009 +++ src/sys/arch/arm/xscale/ixp425_timer.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ixp425_timer.c,v 1.15 2009/10/21 14:15:51 rmind Exp $ */ +/* $NetBSD: ixp425_timer.c,v 1.16 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2003 @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ixp425_timer.c,v 1.15 2009/10/21 14:15:51 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixp425_timer.c,v 1.16 2011/07/01 20:32:51 dyoung Exp $"); #include "opt_ixp425.h" #include "opt_perfctrs.h" @@ -44,7 +44,7 @@ #include <dev/clock_subr.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/intr.h> #include <arm/cpufunc.h> Index: src/sys/arch/arm/xscale/pxa2x0_apm.h diff -u src/sys/arch/arm/xscale/pxa2x0_apm.h:1.1 src/sys/arch/arm/xscale/pxa2x0_apm.h:1.2 --- src/sys/arch/arm/xscale/pxa2x0_apm.h:1.1 Sat Dec 6 22:11:19 2008 +++ src/sys/arch/arm/xscale/pxa2x0_apm.h Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pxa2x0_apm.h,v 1.1 2008/12/06 22:11:19 ober Exp $ */ +/* $NetBSD: pxa2x0_apm.h,v 1.2 2011/07/01 20:32:51 dyoung Exp $ */ /* $OpenBSD: pxa2x0_apm.h,v 1.7 2005/04/13 05:40:07 uwe Exp $ */ /* @@ -22,7 +22,7 @@ #include <sys/event.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/apmvar.h> struct pxa2x0_apm_softc { Index: src/sys/arch/arm/xscale/pxa2x0_i2s.h diff -u src/sys/arch/arm/xscale/pxa2x0_i2s.h:1.1 src/sys/arch/arm/xscale/pxa2x0_i2s.h:1.2 --- src/sys/arch/arm/xscale/pxa2x0_i2s.h:1.1 Sun Dec 17 16:03:33 2006 +++ src/sys/arch/arm/xscale/pxa2x0_i2s.h Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pxa2x0_i2s.h,v 1.1 2006/12/17 16:03:33 peter Exp $ */ +/* $NetBSD: pxa2x0_i2s.h,v 1.2 2011/07/01 20:32:51 dyoung Exp $ */ /* $OpenBSD: pxa2x0_i2s.h,v 1.3 2006/04/04 11:45:40 pascoe Exp $ */ /* @@ -20,7 +20,7 @@ #ifndef _PXA2X0_I2S_H_ #define _PXA2X0_I2S_H_ -#include <machine/bus.h> +#include <sys/bus.h> struct pxa2x0_i2s_dma; struct audio_params; Index: src/sys/arch/arm/xscale/pxa2x0_intr.c diff -u src/sys/arch/arm/xscale/pxa2x0_intr.c:1.18 src/sys/arch/arm/xscale/pxa2x0_intr.c:1.19 --- src/sys/arch/arm/xscale/pxa2x0_intr.c:1.18 Mon Jun 6 16:29:15 2011 +++ src/sys/arch/arm/xscale/pxa2x0_intr.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pxa2x0_intr.c,v 1.18 2011/06/06 16:29:15 matt Exp $ */ +/* $NetBSD: pxa2x0_intr.c,v 1.19 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2002 Genetec Corporation. All rights reserved. @@ -39,13 +39,13 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pxa2x0_intr.c,v 1.18 2011/06/06 16:29:15 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pxa2x0_intr.c,v 1.19 2011/07/01 20:32:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/intr.h> #include <machine/lock.h> Index: src/sys/arch/arm/xscale/pxa2x0_lcd.c diff -u src/sys/arch/arm/xscale/pxa2x0_lcd.c:1.31 src/sys/arch/arm/xscale/pxa2x0_lcd.c:1.32 --- src/sys/arch/arm/xscale/pxa2x0_lcd.c:1.31 Sat May 14 14:00:03 2011 +++ src/sys/arch/arm/xscale/pxa2x0_lcd.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pxa2x0_lcd.c,v 1.31 2011/05/14 14:00:03 nonaka Exp $ */ +/* $NetBSD: pxa2x0_lcd.c,v 1.32 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2002 Genetec Corporation. All rights reserved. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pxa2x0_lcd.c,v 1.31 2011/05/14 14:00:03 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pxa2x0_lcd.c,v 1.32 2011/07/01 20:32:51 dyoung Exp $"); #include "opt_pxa2x0_lcd.h" @@ -58,7 +58,7 @@ #include <dev/rasops/rasops.h> #include <dev/wsfont/wsfont.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/cpu.h> #include <arm/cpufunc.h>