diff options
Diffstat (limited to 'sys/dev')
29 files changed, 47 insertions, 47 deletions
diff --git a/sys/dev/gfb/gfb_pci.c b/sys/dev/gfb/gfb_pci.c index 5fc9f4267c37..0290952576a2 100644 --- a/sys/dev/gfb/gfb_pci.c +++ b/sys/dev/gfb/gfb_pci.c @@ -56,8 +56,8 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/rman.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #include <dev/fb/fbreg.h> #include <dev/fb/gfb.h> diff --git a/sys/dev/gx/if_gx.c b/sys/dev/gx/if_gx.c index a9c3433b7329..d5b882b7e843 100644 --- a/sys/dev/gx/if_gx.c +++ b/sys/dev/gx/if_gx.c @@ -63,8 +63,8 @@ #include <sys/bus.h> #include <sys/rman.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #include <dev/mii/mii.h> #include <dev/mii/miivar.h> diff --git a/sys/dev/hatm/if_hatm.c b/sys/dev/hatm/if_hatm.c index 51538ffcba53..5e8aabed4634 100644 --- a/sys/dev/hatm/if_hatm.c +++ b/sys/dev/hatm/if_hatm.c @@ -73,8 +73,8 @@ __FBSDID("$FreeBSD$"); #include <machine/resource.h> #include <sys/bus.h> #include <sys/rman.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #include <dev/utopia/utopia.h> #include <dev/hatm/if_hatmconf.h> diff --git a/sys/dev/hatm/if_hatm_intr.c b/sys/dev/hatm/if_hatm_intr.c index 2d93e3bd2efb..d337a96bd8a3 100644 --- a/sys/dev/hatm/if_hatm_intr.c +++ b/sys/dev/hatm/if_hatm_intr.c @@ -67,8 +67,8 @@ __FBSDID("$FreeBSD$"); #include <machine/resource.h> #include <sys/bus.h> #include <sys/rman.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #include <dev/utopia/utopia.h> #include <dev/hatm/if_hatmconf.h> diff --git a/sys/dev/hatm/if_hatm_ioctl.c b/sys/dev/hatm/if_hatm_ioctl.c index f9098d83cc6a..410be9db4733 100644 --- a/sys/dev/hatm/if_hatm_ioctl.c +++ b/sys/dev/hatm/if_hatm_ioctl.c @@ -67,8 +67,8 @@ __FBSDID("$FreeBSD$"); #include <machine/resource.h> #include <sys/bus.h> #include <sys/rman.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #include <dev/utopia/utopia.h> #include <dev/hatm/if_hatmconf.h> diff --git a/sys/dev/hatm/if_hatm_rx.c b/sys/dev/hatm/if_hatm_rx.c index 7dbda1c696f0..15e568d13b81 100644 --- a/sys/dev/hatm/if_hatm_rx.c +++ b/sys/dev/hatm/if_hatm_rx.c @@ -69,8 +69,8 @@ __FBSDID("$FreeBSD$"); #include <machine/resource.h> #include <sys/bus.h> #include <sys/rman.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #include <dev/utopia/utopia.h> #include <dev/hatm/if_hatmconf.h> diff --git a/sys/dev/hatm/if_hatm_tx.c b/sys/dev/hatm/if_hatm_tx.c index 5e915ee5fa87..c868951d0878 100644 --- a/sys/dev/hatm/if_hatm_tx.c +++ b/sys/dev/hatm/if_hatm_tx.c @@ -70,8 +70,8 @@ __FBSDID("$FreeBSD$"); #include <machine/resource.h> #include <sys/bus.h> #include <sys/rman.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #include <dev/utopia/utopia.h> #include <dev/hatm/if_hatmconf.h> diff --git a/sys/dev/hea/eni.h b/sys/dev/hea/eni.h index 0133458d74b3..1e753b2c50c6 100644 --- a/sys/dev/hea/eni.h +++ b/sys/dev/hea/eni.h @@ -37,8 +37,8 @@ #ifndef _ENI_ENI_H #define _ENI_ENI_H -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> /* * Physical device name - used to configure HARP devices diff --git a/sys/dev/hfa/fore_buffer.c b/sys/dev/hfa/fore_buffer.c index 47a8f780a2a9..75bb00fc1147 100644 --- a/sys/dev/hfa/fore_buffer.c +++ b/sys/dev/hfa/fore_buffer.c @@ -55,7 +55,7 @@ #include <netatm/atm_stack.h> #include <netatm/atm_pcb.h> #include <netatm/atm_var.h> -#include <pci/pcivar.h> +#include <dev/pci/pcivar.h> #include <dev/hfa/fore.h> #include <dev/hfa/fore_aali.h> #include <dev/hfa/fore_slave.h> diff --git a/sys/dev/hfa/fore_command.c b/sys/dev/hfa/fore_command.c index d4442a9139df..f2208c600d31 100644 --- a/sys/dev/hfa/fore_command.c +++ b/sys/dev/hfa/fore_command.c @@ -54,7 +54,7 @@ #include <netatm/atm_stack.h> #include <netatm/atm_pcb.h> #include <netatm/atm_var.h> -#include <pci/pcivar.h> +#include <dev/pci/pcivar.h> #include <dev/hfa/fore.h> #include <dev/hfa/fore_aali.h> #include <dev/hfa/fore_slave.h> diff --git a/sys/dev/hfa/fore_globals.c b/sys/dev/hfa/fore_globals.c index 78e57e610995..b8e98153d19b 100644 --- a/sys/dev/hfa/fore_globals.c +++ b/sys/dev/hfa/fore_globals.c @@ -50,7 +50,7 @@ #include <netatm/atm_stack.h> #include <netatm/atm_pcb.h> #include <netatm/atm_var.h> -#include <pci/pcivar.h> +#include <dev/pci/pcivar.h> #include <dev/hfa/fore.h> #include <dev/hfa/fore_aali.h> #include <dev/hfa/fore_slave.h> diff --git a/sys/dev/hfa/fore_if.c b/sys/dev/hfa/fore_if.c index 1728f99db053..f4f796ffa435 100644 --- a/sys/dev/hfa/fore_if.c +++ b/sys/dev/hfa/fore_if.c @@ -51,7 +51,7 @@ #include <netatm/atm_stack.h> #include <netatm/atm_pcb.h> #include <netatm/atm_var.h> -#include <pci/pcivar.h> +#include <dev/pci/pcivar.h> #include <dev/hfa/fore.h> #include <dev/hfa/fore_aali.h> #include <dev/hfa/fore_slave.h> diff --git a/sys/dev/hfa/fore_init.c b/sys/dev/hfa/fore_init.c index 2957b7c3503f..1a3e6950b8c2 100644 --- a/sys/dev/hfa/fore_init.c +++ b/sys/dev/hfa/fore_init.c @@ -54,7 +54,7 @@ #include <netatm/atm_stack.h> #include <netatm/atm_pcb.h> #include <netatm/atm_var.h> -#include <pci/pcivar.h> +#include <dev/pci/pcivar.h> #include <dev/hfa/fore.h> #include <dev/hfa/fore_aali.h> #include <dev/hfa/fore_slave.h> diff --git a/sys/dev/hfa/fore_intr.c b/sys/dev/hfa/fore_intr.c index 319c66548a3c..9c0f29dabba7 100644 --- a/sys/dev/hfa/fore_intr.c +++ b/sys/dev/hfa/fore_intr.c @@ -45,7 +45,7 @@ #include <netatm/atm_sys.h> #include <netatm/atm_cm.h> #include <netatm/atm_if.h> -#include <pci/pcivar.h> +#include <dev/pci/pcivar.h> #include <dev/hfa/fore.h> #include <dev/hfa/fore_aali.h> #include <dev/hfa/fore_slave.h> diff --git a/sys/dev/hfa/fore_load.c b/sys/dev/hfa/fore_load.c index 334cb88cd6ec..f56102ae98c1 100644 --- a/sys/dev/hfa/fore_load.c +++ b/sys/dev/hfa/fore_load.c @@ -57,8 +57,8 @@ #include <netatm/atm_stack.h> #include <netatm/atm_pcb.h> #include <netatm/atm_var.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #include <dev/hfa/fore.h> #include <dev/hfa/fore_aali.h> #include <dev/hfa/fore_slave.h> diff --git a/sys/dev/hfa/fore_output.c b/sys/dev/hfa/fore_output.c index 7e18ee6846b8..02266fdf8982 100644 --- a/sys/dev/hfa/fore_output.c +++ b/sys/dev/hfa/fore_output.c @@ -55,7 +55,7 @@ #include <netatm/atm_stack.h> #include <netatm/atm_pcb.h> #include <netatm/atm_var.h> -#include <pci/pcivar.h> +#include <dev/pci/pcivar.h> #include <dev/hfa/fore.h> #include <dev/hfa/fore_aali.h> #include <dev/hfa/fore_slave.h> diff --git a/sys/dev/hfa/fore_receive.c b/sys/dev/hfa/fore_receive.c index 5cce110becf8..fb2095ef1f10 100644 --- a/sys/dev/hfa/fore_receive.c +++ b/sys/dev/hfa/fore_receive.c @@ -55,7 +55,7 @@ #include <netatm/atm_stack.h> #include <netatm/atm_pcb.h> #include <netatm/atm_var.h> -#include <pci/pcivar.h> +#include <dev/pci/pcivar.h> #include <dev/hfa/fore.h> #include <dev/hfa/fore_aali.h> #include <dev/hfa/fore_slave.h> diff --git a/sys/dev/hfa/fore_stats.c b/sys/dev/hfa/fore_stats.c index d8518afd2fd9..a160dbe7bf3c 100644 --- a/sys/dev/hfa/fore_stats.c +++ b/sys/dev/hfa/fore_stats.c @@ -52,7 +52,7 @@ #include <netatm/atm_stack.h> #include <netatm/atm_pcb.h> #include <netatm/atm_var.h> -#include <pci/pcivar.h> +#include <dev/pci/pcivar.h> #include <dev/hfa/fore.h> #include <dev/hfa/fore_aali.h> #include <dev/hfa/fore_slave.h> diff --git a/sys/dev/hfa/fore_timer.c b/sys/dev/hfa/fore_timer.c index e9fc4edbab4b..0828d5c85033 100644 --- a/sys/dev/hfa/fore_timer.c +++ b/sys/dev/hfa/fore_timer.c @@ -50,7 +50,7 @@ #include <netatm/atm_stack.h> #include <netatm/atm_pcb.h> #include <netatm/atm_var.h> -#include <pci/pcivar.h> +#include <dev/pci/pcivar.h> #include <dev/hfa/fore.h> #include <dev/hfa/fore_aali.h> #include <dev/hfa/fore_slave.h> diff --git a/sys/dev/hfa/fore_transmit.c b/sys/dev/hfa/fore_transmit.c index 006a58041634..f5b78c8a42c0 100644 --- a/sys/dev/hfa/fore_transmit.c +++ b/sys/dev/hfa/fore_transmit.c @@ -53,7 +53,7 @@ #include <netatm/atm_stack.h> #include <netatm/atm_pcb.h> #include <netatm/atm_var.h> -#include <pci/pcivar.h> +#include <dev/pci/pcivar.h> #include <dev/hfa/fore.h> #include <dev/hfa/fore_aali.h> #include <dev/hfa/fore_slave.h> diff --git a/sys/dev/hfa/fore_vcm.c b/sys/dev/hfa/fore_vcm.c index 4a37878d496d..cd0dd3c495df 100644 --- a/sys/dev/hfa/fore_vcm.c +++ b/sys/dev/hfa/fore_vcm.c @@ -51,7 +51,7 @@ #include <netatm/atm_stack.h> #include <netatm/atm_pcb.h> #include <netatm/atm_var.h> -#include <pci/pcivar.h> +#include <dev/pci/pcivar.h> #include <dev/hfa/fore.h> #include <dev/hfa/fore_aali.h> #include <dev/hfa/fore_slave.h> diff --git a/sys/dev/hifn/hifn7751.c b/sys/dev/hifn/hifn7751.c index 4f787c0b3b18..d28738905901 100644 --- a/sys/dev/hifn/hifn7751.c +++ b/sys/dev/hifn/hifn7751.c @@ -69,8 +69,8 @@ #include <opencrypto/cryptodev.h> #include <sys/random.h> -#include <pci/pcivar.h> -#include <pci/pcireg.h> +#include <dev/pci/pcivar.h> +#include <dev/pci/pcireg.h> #ifdef HIFN_RNDTEST #include <dev/rndtest/rndtest.h> diff --git a/sys/dev/hme/if_hme_pci.c b/sys/dev/hme/if_hme_pci.c index f1139210354f..a67af5dce0ae 100644 --- a/sys/dev/hme/if_hme_pci.c +++ b/sys/dev/hme/if_hme_pci.c @@ -56,8 +56,8 @@ #include <mii/mii.h> #include <mii/miivar.h> -#include <pci/pcivar.h> -#include <pci/pcireg.h> +#include <dev/pci/pcivar.h> +#include <dev/pci/pcireg.h> #include <hme/if_hmereg.h> #include <hme/if_hmevar.h> diff --git a/sys/dev/ichsmb/ichsmb_pci.c b/sys/dev/ichsmb/ichsmb_pci.c index e5fbdae22b94..053b6e0b55a7 100644 --- a/sys/dev/ichsmb/ichsmb_pci.c +++ b/sys/dev/ichsmb/ichsmb_pci.c @@ -57,8 +57,8 @@ #include <sys/rman.h> #include <machine/resource.h> -#include <pci/pcivar.h> -#include <pci/pcireg.h> +#include <dev/pci/pcivar.h> +#include <dev/pci/pcireg.h> #include <dev/smbus/smbconf.h> diff --git a/sys/dev/ida/ida_pci.c b/sys/dev/ida/ida_pci.c index 92cdba7e7f4a..3a74022a300e 100644 --- a/sys/dev/ida/ida_pci.c +++ b/sys/dev/ida/ida_pci.c @@ -40,8 +40,8 @@ #include <machine/resource.h> #include <sys/rman.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #include <geom/geom_disk.h> diff --git a/sys/dev/iir/iir_pci.c b/sys/dev/iir/iir_pci.c index cb61f31a0711..dadb82aa2263 100644 --- a/sys/dev/iir/iir_pci.c +++ b/sys/dev/iir/iir_pci.c @@ -38,7 +38,7 @@ * TODO: */ -#ident "$Id: iir_pci.c 1.1 2001/05/22 20:14:12 achim Exp $" +#ident "$Id: iir_pci.c,v 1.8 2003/07/01 15:51:58 scottl Exp $" /* #include "opt_iir.h" */ @@ -58,8 +58,8 @@ #include <machine/clock.h> #include <sys/rman.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #include <cam/scsi/scsi_all.h> diff --git a/sys/dev/ips/ips.h b/sys/dev/ips/ips.h index 68b41e55fadb..02d58c983813 100644 --- a/sys/dev/ips/ips.h +++ b/sys/dev/ips/ips.h @@ -45,8 +45,8 @@ #include <sys/rman.h> #include <machine/resource.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> /* * IPS CONSTANTS diff --git a/sys/dev/ips/ips_disk.h b/sys/dev/ips/ips_disk.h index 62057450ad1a..9bc67260b661 100644 --- a/sys/dev/ips/ips_disk.h +++ b/sys/dev/ips/ips_disk.h @@ -46,8 +46,8 @@ #include <sys/rman.h> #include <machine/resource.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #define IPS_MAX_IO_SIZE 0x10000 diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c index 0bb854f1eea1..773b03e108ea 100644 --- a/sys/dev/isp/isp_pci.c +++ b/sys/dev/isp/isp_pci.c @@ -33,8 +33,8 @@ #include <sys/module.h> #include <sys/bus.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #include <machine/bus_memio.h> #include <machine/bus_pio.h> |