diff options
| author | simokawa <simokawa@FreeBSD.org> | 2003-06-30 06:33:18 +0000 |
|---|---|---|
| committer | simokawa <simokawa@FreeBSD.org> | 2003-06-30 06:33:18 +0000 |
| commit | fd6a432df0348223928955a81efa9a79edac7d2b (patch) | |
| tree | d315f00f2eac2862ed1f242648121321d6c983ef /sys/dev | |
| parent | 67068d48167e3506e10a16d9e61d6362db843c40 (diff) | |
| download | FreeBSD-src-fd6a432df0348223928955a81efa9a79edac7d2b.zip FreeBSD-src-fd6a432df0348223928955a81efa9a79edac7d2b.tar.gz | |
Include file clean up.
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> |
