diff options
| author | Hidetoshi Shimokawa <simokawa@FreeBSD.org> | 2003-06-30 06:33:18 +0000 |
|---|---|---|
| committer | Hidetoshi Shimokawa <simokawa@FreeBSD.org> | 2003-06-30 06:33:18 +0000 |
| commit | 170e7a20d0c2bd98ec0f69cd22760eb91090074e (patch) | |
| tree | d315f00f2eac2862ed1f242648121321d6c983ef /sys/dev/firewire | |
| parent | 5af40bb68ac5ebc8f50531fe6f99d040b7ebdd93 (diff) | |
Notes
Diffstat (limited to 'sys/dev/firewire')
| -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 25230ed6c019d..98544ca9caf49 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 4dfe5cf8b9f72..e02caeb696f9f 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 dcc5caaab0c11..9745ce86d4376 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> |