diff options
| author | jhb <jhb@FreeBSD.org> | 2003-05-13 16:59:46 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2003-05-13 16:59:46 +0000 |
| commit | bc2a857823c575cc2864eafc2bbfe7c4c0d733b1 (patch) | |
| tree | a3f137a7a6dc836703d6966958c183ddc0f1edbf /sys/dev | |
| parent | c8f885429c28e58cf75a312c4db24465adf3b789 (diff) | |
| download | FreeBSD-src-bc2a857823c575cc2864eafc2bbfe7c4c0d733b1.zip FreeBSD-src-bc2a857823c575cc2864eafc2bbfe7c4c0d733b1.tar.gz | |
Add some extra #ifdef stubs so that this compiles on 4.8.
Approved by: re (rwatson/bmah)
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/acpica/Osd/OsdHardware.c | 4 | ||||
| -rw-r--r-- | sys/dev/acpica/acpivar.h | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sys/dev/acpica/Osd/OsdHardware.c b/sys/dev/acpica/Osd/OsdHardware.c index 5c38cbf..46deb968 100644 --- a/sys/dev/acpica/Osd/OsdHardware.c +++ b/sys/dev/acpica/Osd/OsdHardware.c @@ -36,7 +36,11 @@ #include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/pci_cfgreg.h> +#if __FreeBSD_version >= 500000 #include <dev/pci/pcireg.h> +#else +#include <pci/pcireg.h> +#endif /* * ACPICA's rather gung-ho approach to hardware resource ownership is a little diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index 12a5a68..cd254ac 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -39,6 +39,10 @@ #include <machine/bus.h> #include <machine/resource.h> +#if __FreeBSD_version < 500000 +typedef vm_offset_t vm_paddr_t; +#endif + struct acpi_softc { device_t acpi_dev; dev_t acpi_dev_t; @@ -389,12 +393,14 @@ extern int acpi_cmbat_get_battinfo(int, struct acpi_battinfo *); extern int acpi_acad_get_acline(int *); +#if __FreeBSD_version >= 500000 #ifndef ACPI_MAX_THREADS #define ACPI_MAX_THREADS 3 #endif #if ACPI_MAX_THREADS > 0 #define ACPI_USE_THREADS #endif +#endif #ifdef ACPI_USE_THREADS /* |
