diff options
author | imp <imp@FreeBSD.org> | 2003-08-22 05:54:52 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2003-08-22 05:54:52 +0000 |
commit | c23aaeeba46cfb112bb22a74c0898470331d3e18 (patch) | |
tree | 633ff3cbdbfdb63210ca731968f72ea813a82ed7 /sys/dev/bktr | |
parent | 15f81fe316b4b7defea9d5f5127ba0853ed8bfcd (diff) | |
download | FreeBSD-src-c23aaeeba46cfb112bb22a74c0898470331d3e18.zip FreeBSD-src-c23aaeeba46cfb112bb22a74c0898470331d3e18.tar.gz |
Prefer new location of pci include files (which have only been in the
tree for two or more years now), except in a few places where there's
code to be compatible with older versions of FreeBSD.
Diffstat (limited to 'sys/dev/bktr')
-rw-r--r-- | sys/dev/bktr/bktr_audio.c | 5 | ||||
-rw-r--r-- | sys/dev/bktr/bktr_card.c | 5 | ||||
-rw-r--r-- | sys/dev/bktr/bktr_core.c | 5 | ||||
-rw-r--r-- | sys/dev/bktr/bktr_i2c.c | 7 | ||||
-rw-r--r-- | sys/dev/bktr/bktr_os.c | 6 | ||||
-rw-r--r-- | sys/dev/bktr/bktr_tuner.c | 5 |
6 files changed, 21 insertions, 12 deletions
diff --git a/sys/dev/bktr/bktr_audio.c b/sys/dev/bktr/bktr_audio.c index b948891..3821b8a 100644 --- a/sys/dev/bktr/bktr_audio.c +++ b/sys/dev/bktr/bktr_audio.c @@ -57,9 +57,10 @@ #if (__FreeBSD_version < 500000) #include <machine/clock.h> /* for DELAY */ -#endif - #include <pci/pcivar.h> +#else +#include <dev/pci/pcivar.h> +#endif #if (__FreeBSD_version >=300000) #include <machine/bus_memio.h> /* for bus space */ diff --git a/sys/dev/bktr/bktr_card.c b/sys/dev/bktr/bktr_card.c index c61e4e2..fdae22e 100644 --- a/sys/dev/bktr/bktr_card.c +++ b/sys/dev/bktr/bktr_card.c @@ -57,9 +57,10 @@ #if (__FreeBSD_version < 500000) #include <machine/clock.h> /* for DELAY */ -#endif - #include <pci/pcivar.h> +#else +#include <dev/pci/pcivar.h> +#endif #if (__FreeBSD_version >=300000) #include <machine/bus_memio.h> /* for bus space */ diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c index b95c534..0d00658 100644 --- a/sys/dev/bktr/bktr_core.c +++ b/sys/dev/bktr/bktr_core.c @@ -131,9 +131,11 @@ #include <machine/clock.h> /* for DELAY */ #define PROC_LOCK(p) #define PROC_UNLOCK(p) +#include <pci/pcivar.h> +#else +#include <dev/pci/pcivar.h> #endif -#include <pci/pcivar.h> #if (__FreeBSD_version >=300000) #include <machine/bus_memio.h> /* for bus space */ @@ -223,7 +225,6 @@ bktr_name(bktr_ptr_t bktr) #endif /* __NetBSD__ || __OpenBSD__ */ - typedef u_char bool_t; #define BKTRPRI (PZERO+8)|PCATCH diff --git a/sys/dev/bktr/bktr_i2c.c b/sys/dev/bktr/bktr_i2c.c index 7ed0988..2075eea 100644 --- a/sys/dev/bktr/bktr_i2c.c +++ b/sys/dev/bktr/bktr_i2c.c @@ -51,6 +51,11 @@ #if (__FreeBSD_version < 500000) #include <machine/clock.h> /* for DELAY */ +#include <pci/pcivar.h> +#include <pci/pcireg.h> +#else +#include <dev/pci/pcivar.h> +#include <dev/pci/pcireg.h> #endif #if (__FreeBSD_version >=300000) @@ -59,8 +64,6 @@ #include <sys/bus.h> #endif -#include <pci/pcivar.h> -#include <pci/pcireg.h> #include <machine/ioctl_meteor.h> #include <machine/ioctl_bt848.h> /* extensions to ioctl_meteor.h */ diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c index 8451ae9..1a7a807 100644 --- a/sys/dev/bktr/bktr_os.c +++ b/sys/dev/bktr/bktr_os.c @@ -96,10 +96,12 @@ #if (__FreeBSD_version < 500000) #include <machine/clock.h> /* for DELAY */ -#endif - #include <pci/pcivar.h> #include <pci/pcireg.h> +#else +#include <dev/pci/pcivar.h> +#include <dev/pci/pcireg.h> +#endif #include <sys/sysctl.h> int bt848_card = -1; diff --git a/sys/dev/bktr/bktr_tuner.c b/sys/dev/bktr/bktr_tuner.c index 999766c..5f3b15c 100644 --- a/sys/dev/bktr/bktr_tuner.c +++ b/sys/dev/bktr/bktr_tuner.c @@ -54,10 +54,11 @@ #endif #ifdef __FreeBSD__ -#include <pci/pcivar.h> - #if (__FreeBSD_version < 500000) #include <machine/clock.h> /* for DELAY */ +#include <pci/pcivar.h> +#else +#include <dev/pci/pcivar.h> #endif #if (__FreeBSD_version >=300000) |