diff options
39 files changed, 77 insertions, 77 deletions
diff --git a/sys/dev/safe/safe.c b/sys/dev/safe/safe.c index ebd170e3fc6e..b06ba76c8e55 100644 --- a/sys/dev/safe/safe.c +++ b/sys/dev/safe/safe.c @@ -60,8 +60,8 @@ __FBSDID("$FreeBSD$"); #include <sys/md5.h> #include <sys/random.h> -#include <pci/pcivar.h> -#include <pci/pcireg.h> +#include <dev/pci/pcivar.h> +#include <dev/pci/pcireg.h> #ifdef SAFE_RNDTEST #include <dev/rndtest/rndtest.h> diff --git a/sys/dev/sbni/if_sbni_pci.c b/sys/dev/sbni/if_sbni_pci.c index 2e5ae18a82d0..71095c67fe11 100644 --- a/sys/dev/sbni/if_sbni_pci.c +++ b/sys/dev/sbni/if_sbni_pci.c @@ -43,8 +43,8 @@ #include <net/ethernet.h> #include <net/if_arp.h> -#include <pci/pcivar.h> -#include <pci/pcireg.h> +#include <dev/pci/pcivar.h> +#include <dev/pci/pcireg.h> #include <dev/sbni/if_sbnireg.h> #include <dev/sbni/if_sbnivar.h> diff --git a/sys/dev/sbsh/if_sbsh.c b/sys/dev/sbsh/if_sbsh.c index 147a745f8810..99f4038a9aa8 100644 --- a/sys/dev/sbsh/if_sbsh.c +++ b/sys/dev/sbsh/if_sbsh.c @@ -52,8 +52,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/sbsh/if_sbshreg.h> diff --git a/sys/dev/si/si_pci.c b/sys/dev/si/si_pci.c index 96a865c5dfa6..9dffe5162394 100644 --- a/sys/dev/si/si_pci.c +++ b/sys/dev/si/si_pci.c @@ -31,7 +31,7 @@ #include <dev/si/sireg.h> #include <dev/si/sivar.h> -#include <pci/pcivar.h> +#include <dev/pci/pcivar.h> static int si_pci_probe(device_t dev) diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c index 77b39840fd57..85c48dd411fb 100644 --- a/sys/dev/sound/pci/als4000.c +++ b/sys/dev/sound/pci/als4000.c @@ -37,8 +37,8 @@ #include <dev/sound/isa/sb.h> #include <dev/sound/pci/als4000.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #include "mixer_if.h" diff --git a/sys/dev/sound/pci/au88x0.c b/sys/dev/sound/pci/au88x0.c index 81416dde2621..ab00d0f531cb 100644 --- a/sys/dev/sound/pci/au88x0.c +++ b/sys/dev/sound/pci/au88x0.c @@ -34,8 +34,8 @@ #include <machine/bus.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> /***************************************************************************\ diff --git a/sys/dev/sound/pci/aureal.c b/sys/dev/sound/pci/aureal.c index 3630699e4703..a822f3884f4a 100644 --- a/sys/dev/sound/pci/aureal.c +++ b/sys/dev/sound/pci/aureal.c @@ -28,8 +28,8 @@ #include <dev/sound/pcm/ac97.h> #include <dev/sound/pci/aureal.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> SND_DECLARE_FILE("$FreeBSD$"); diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c index f46611481b3f..787f079167f4 100644 --- a/sys/dev/sound/pci/cmi.c +++ b/sys/dev/sound/pci/cmi.c @@ -44,8 +44,8 @@ #include <dev/sound/pci/cmireg.h> #include <dev/sound/isa/sb.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #include <sys/sysctl.h> diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c index d9b91ddd2660..27b1730aac9e 100644 --- a/sys/dev/sound/pci/cs4281.c +++ b/sys/dev/sound/pci/cs4281.c @@ -32,8 +32,8 @@ #include <dev/sound/pcm/sound.h> #include <dev/sound/pcm/ac97.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #include <dev/sound/pci/cs4281.h> diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c index 5671e86cd9df..67fd3f7ed9fa 100644 --- a/sys/dev/sound/pci/csa.c +++ b/sys/dev/sound/pci/csa.c @@ -43,8 +43,8 @@ #include <dev/sound/pci/csareg.h> #include <dev/sound/pci/csavar.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #include <gnu/dev/sound/pci/csaimg.h> diff --git a/sys/dev/sound/pci/csamidi.c b/sys/dev/sound/pci/csamidi.c index be3604877a45..7fe6ae73c622 100644 --- a/sys/dev/sound/pci/csamidi.c +++ b/sys/dev/sound/pci/csamidi.c @@ -31,8 +31,8 @@ #include <dev/sound/pci/csareg.h> #include <machine/cpufunc.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> static devclass_t midi_devclass; diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c index d379528af170..a6e40ebf5b7c 100644 --- a/sys/dev/sound/pci/csapcm.c +++ b/sys/dev/sound/pci/csapcm.c @@ -35,8 +35,8 @@ #include <dev/sound/pci/csareg.h> #include <dev/sound/pci/csavar.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> SND_DECLARE_FILE("$FreeBSD$"); diff --git a/sys/dev/sound/pci/ds1.c b/sys/dev/sound/pci/ds1.c index e3a9a6e6c4f7..4acec376d7f0 100644 --- a/sys/dev/sound/pci/ds1.c +++ b/sys/dev/sound/pci/ds1.c @@ -27,8 +27,8 @@ #include <dev/sound/pcm/sound.h> #include <dev/sound/pcm/ac97.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #include <dev/sound/pci/ds1.h> #include <dev/sound/pci/ds1-fw.h> diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c index a0a986fbb750..f7b8d48a8443 100644 --- a/sys/dev/sound/pci/emu10k1.c +++ b/sys/dev/sound/pci/emu10k1.c @@ -28,8 +28,8 @@ #include <dev/sound/pcm/ac97.h> #include <gnu/dev/sound/pci/emu10k1.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #include <sys/queue.h> SND_DECLARE_FILE("$FreeBSD$"); diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c index 9ae6606f68d1..a58fb33b3552 100644 --- a/sys/dev/sound/pci/es137x.c +++ b/sys/dev/sound/pci/es137x.c @@ -52,8 +52,8 @@ #include <dev/sound/pcm/ac97.h> #include <dev/sound/pci/es137x.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #include <sys/sysctl.h> diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c index 417ed9986c91..40f2bdea3a4d 100644 --- a/sys/dev/sound/pci/fm801.c +++ b/sys/dev/sound/pci/fm801.c @@ -26,8 +26,8 @@ #include <dev/sound/pcm/sound.h> #include <dev/sound/pcm/ac97.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> SND_DECLARE_FILE("$FreeBSD$"); diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c index 9027296d6fcf..21349e71f7b1 100644 --- a/sys/dev/sound/pci/ich.c +++ b/sys/dev/sound/pci/ich.c @@ -29,8 +29,8 @@ #include <dev/sound/pcm/ac97.h> #include <dev/sound/pci/ich.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> SND_DECLARE_FILE("$FreeBSD$"); diff --git a/sys/dev/sound/pci/maestro.c b/sys/dev/sound/pci/maestro.c index 10613ed311c5..b7124f716784 100644 --- a/sys/dev/sound/pci/maestro.c +++ b/sys/dev/sound/pci/maestro.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: maestro.c,v 1.12 2000/09/06 03:32:34 taku Exp $ + * $Id: maestro.c,v 1.18 2003/07/01 15:52:01 scottl Exp $ */ /* @@ -46,8 +46,8 @@ #include <dev/sound/pcm/sound.h> #include <dev/sound/pcm/ac97.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #include <dev/sound/pci/maestro_reg.h> diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c index 2f9f8022d695..72ee0c520dc3 100644 --- a/sys/dev/sound/pci/maestro3.c +++ b/sys/dev/sound/pci/maestro3.c @@ -55,8 +55,8 @@ #include <dev/sound/pcm/sound.h> #include <dev/sound/pcm/ac97.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #include <gnu/dev/sound/pci/maestro3_reg.h> #include <gnu/dev/sound/pci/maestro3_dsp.h> diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c index 86a73c54e487..039df031f1ec 100644 --- a/sys/dev/sound/pci/neomagic.c +++ b/sys/dev/sound/pci/neomagic.c @@ -31,8 +31,8 @@ #include <dev/sound/pci/neomagic.h> #include <dev/sound/pci/neomagic-coeff.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> SND_DECLARE_FILE("$FreeBSD$"); diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c index e13da9f4e039..d166b29d173b 100644 --- a/sys/dev/sound/pci/solo.c +++ b/sys/dev/sound/pci/solo.c @@ -25,8 +25,8 @@ #include <dev/sound/pcm/sound.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #include <dev/sound/isa/sb.h> #include <dev/sound/chip.h> diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c index 19a92dcb471e..6b814b5e7a4a 100644 --- a/sys/dev/sound/pci/t4dwave.c +++ b/sys/dev/sound/pci/t4dwave.c @@ -28,8 +28,8 @@ #include <dev/sound/pcm/ac97.h> #include <dev/sound/pci/t4dwave.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> SND_DECLARE_FILE("$FreeBSD$"); diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c index 598e88fdb8ee..fad276ca2af4 100644 --- a/sys/dev/sound/pci/via8233.c +++ b/sys/dev/sound/pci/via8233.c @@ -38,8 +38,8 @@ #include <dev/sound/pcm/sound.h> #include <dev/sound/pcm/ac97.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #include <sys/sysctl.h> #include <dev/sound/pci/via8233.h> diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c index 95c20f1cfbc8..10e21a2a5f8e 100644 --- a/sys/dev/sound/pci/via82c686.c +++ b/sys/dev/sound/pci/via82c686.c @@ -27,8 +27,8 @@ #include <dev/sound/pcm/sound.h> #include <dev/sound/pcm/ac97.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #include <sys/sysctl.h> #include <dev/sound/pci/via82c686.h> diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c index 589be74576fd..7ba9067d0f7e 100644 --- a/sys/dev/sound/pci/vibes.c +++ b/sys/dev/sound/pci/vibes.c @@ -31,8 +31,8 @@ #include <dev/sound/pcm/sound.h> #include <dev/sound/pci/vibes.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #include "mixer_if.h" diff --git a/sys/dev/sr/if_sr_pci.c b/sys/dev/sr/if_sr_pci.c index 48a6515bb371..209a340fca09 100644 --- a/sys/dev/sr/if_sr_pci.c +++ b/sys/dev/sr/if_sr_pci.c @@ -42,7 +42,7 @@ #include <machine/bus_memio.h> #include <sys/rman.h> -#include <pci/pcivar.h> +#include <dev/pci/pcivar.h> #include <machine/md_var.h> #include <dev/ic/hd64570.h> diff --git a/sys/dev/stg/tmc18c30_pci.c b/sys/dev/stg/tmc18c30_pci.c index 40bc575363f2..540532f85137 100644 --- a/sys/dev/stg/tmc18c30_pci.c +++ b/sys/dev/stg/tmc18c30_pci.c @@ -52,8 +52,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 <cam/scsi/scsi_low.h> #include <cam/scsi/scsi_low_pisa.h> diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c index 084179edc258..8affed068dbb 100644 --- a/sys/dev/sym/sym_hipd.c +++ b/sys/dev/sym/sym_hipd.c @@ -98,8 +98,8 @@ #include <sys/proc.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #ifdef FreeBSD_Bus_Space_Abstraction #include <machine/bus_memio.h> diff --git a/sys/dev/tdfx/tdfx_pci.c b/sys/dev/tdfx/tdfx_pci.c index c715d1a5cb99..ad6c9e2993db 100644 --- a/sys/dev/tdfx/tdfx_pci.c +++ b/sys/dev/tdfx/tdfx_pci.c @@ -55,8 +55,8 @@ #include <sys/systm.h> #include <sys/uio.h> -#include <pci/pcivar.h> -#include <pci/pcireg.h> +#include <dev/pci/pcivar.h> +#include <dev/pci/pcireg.h> #include <vm/vm.h> #include <vm/vm_kern.h> diff --git a/sys/dev/tga/tga_pci.c b/sys/dev/tga/tga_pci.c index b6b57f04777e..ff46eba09e78 100644 --- a/sys/dev/tga/tga_pci.c +++ b/sys/dev/tga/tga_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/tga.h> diff --git a/sys/dev/trm/trm.c b/sys/dev/trm/trm.c index 94d797003d0b..8974207d364f 100644 --- a/sys/dev/trm/trm.c +++ b/sys/dev/trm/trm.c @@ -79,8 +79,8 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> #include <vm/pmap.h> -#include <pci/pcivar.h> -#include <pci/pcireg.h> +#include <dev/pci/pcivar.h> +#include <dev/pci/pcireg.h> #include <machine/resource.h> #include <machine/bus_pio.h> #include <machine/bus.h> diff --git a/sys/dev/twe/twe_compat.h b/sys/dev/twe/twe_compat.h index 181c79f82e4f..981199a523b5 100644 --- a/sys/dev/twe/twe_compat.h +++ b/sys/dev/twe/twe_compat.h @@ -53,8 +53,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> /* * These macros allows us to build a version of the driver which can diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c index 9b1b3e6e2b86..ad5e7b7f9a9c 100644 --- a/sys/dev/tx/if_tx.c +++ b/sys/dev/tx/if_tx.c @@ -66,8 +66,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/mii/mii.h> #include <dev/mii/miivar.h> diff --git a/sys/dev/ubsec/ubsec.c b/sys/dev/ubsec/ubsec.c index eb594c90d997..173ef68158e3 100644 --- a/sys/dev/ubsec/ubsec.c +++ b/sys/dev/ubsec/ubsec.c @@ -73,8 +73,8 @@ #include <sys/md5.h> #include <sys/random.h> -#include <pci/pcivar.h> -#include <pci/pcireg.h> +#include <dev/pci/pcivar.h> +#include <dev/pci/pcireg.h> /* grr, #defines for gratuitous incompatibility in queue.h */ #define SIMPLEQ_HEAD STAILQ_HEAD diff --git a/sys/dev/usb/ehci_pci.c b/sys/dev/usb/ehci_pci.c index efbcd4ff17c1..78ab401f1723 100644 --- a/sys/dev/usb/ehci_pci.c +++ b/sys/dev/usb/ehci_pci.c @@ -66,8 +66,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/usb/usb.h> #include <dev/usb/usbdi.h> diff --git a/sys/dev/usb/ohci_pci.c b/sys/dev/usb/ohci_pci.c index 3d67e4f4db43..cd65897aeb5b 100644 --- a/sys/dev/usb/ohci_pci.c +++ b/sys/dev/usb/ohci_pci.c @@ -61,8 +61,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/usb/usb.h> #include <dev/usb/usbdi.h> diff --git a/sys/dev/usb/uhci_pci.c b/sys/dev/usb/uhci_pci.c index 1942578f6083..acb26c5b202b 100644 --- a/sys/dev/usb/uhci_pci.c +++ b/sys/dev/usb/uhci_pci.c @@ -63,8 +63,8 @@ #include <sys/rman.h> #endif -#include <pci/pcivar.h> -#include <pci/pcireg.h> +#include <dev/pci/pcivar.h> +#include <dev/pci/pcireg.h> #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> diff --git a/sys/dev/vx/if_vx_pci.c b/sys/dev/vx/if_vx_pci.c index 095f9df004ea..bbbe08cf680d 100644 --- a/sys/dev/vx/if_vx_pci.c +++ b/sys/dev/vx/if_vx_pci.c @@ -43,8 +43,8 @@ #include <sys/bus.h> #include <sys/rman.h> -#include <pci/pcivar.h> -#include <pci/pcireg.h> +#include <dev/pci/pcivar.h> +#include <dev/pci/pcireg.h> #include <dev/vx/if_vxreg.h> diff --git a/sys/dev/wi/if_wi_pci.c b/sys/dev/wi/if_wi_pci.c index 6dab7f56dbd8..78dd0a2a314e 100644 --- a/sys/dev/wi/if_wi_pci.c +++ b/sys/dev/wi/if_wi_pci.c @@ -52,8 +52,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 <net/if.h> #include <net/if_arp.h> |