diff options
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/firewire/firewire.c | 5 | ||||
-rw-r--r-- | sys/dev/firewire/fwohci.c | 6 | ||||
-rw-r--r-- | sys/dev/firewire/fwohci_pci.c | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/sys/dev/firewire/firewire.c b/sys/dev/firewire/firewire.c index 25230ed..98544ca 100644 --- a/sys/dev/firewire/firewire.c +++ b/sys/dev/firewire/firewire.c @@ -47,8 +47,9 @@ #include <sys/conf.h> #include <sys/sysctl.h> -#include <machine/cpufunc.h> /* for rdtsc proto for clock.h below */ -#include <machine/clock.h> +#if __FreeBSD_version < 500000 +#include <machine/clock.h> /* for DELAY() */ +#endif #include <sys/bus.h> /* used by smbus and newbus */ #include <machine/bus.h> diff --git a/sys/dev/firewire/fwohci.c b/sys/dev/firewire/fwohci.c index 4dfe5cf..e02caeb 100644 --- a/sys/dev/firewire/fwohci.c +++ b/sys/dev/firewire/fwohci.c @@ -62,8 +62,10 @@ #include <machine/resource.h> #include <sys/rman.h> -#include <machine/cpufunc.h> /* for rdtsc proto for clock.h below */ -#include <machine/clock.h> +#if __FreeBSD_version < 500000 +#include <machine/clock.h> /* for DELAY() */ +#endif + #include <pci/pcivar.h> #include <pci/pcireg.h> diff --git a/sys/dev/firewire/fwohci_pci.c b/sys/dev/firewire/fwohci_pci.c index dcc5caa..9745ce8 100644 --- a/sys/dev/firewire/fwohci_pci.c +++ b/sys/dev/firewire/fwohci_pci.c @@ -47,6 +47,10 @@ #include <sys/malloc.h> #include <machine/resource.h> +#if __FreeBSD_version < 500000 +#include <machine/clock.h> /* for DELAY() */ +#endif + #include <pci/pcivar.h> #include <pci/pcireg.h> |