diff options
| author | Warner Losh <imp@FreeBSD.org> | 2006-01-01 21:04:31 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2006-01-01 21:04:31 +0000 |
| commit | a48895a77e3b6390481c1bb4fa850252c04d183d (patch) | |
| tree | 5b5c292e2f15aa6952afca425c01152ced6c1405 /sys/dev/pci/pci.c | |
| parent | 501755f4f61fef5716992ea6d59cfba80eef84ee (diff) | |
| download | src-a48895a77e3b6390481c1bb4fa850252c04d183d.tar.gz src-a48895a77e3b6390481c1bb4fa850252c04d183d.zip | |
Use __HAVE_ACPI and __PCI_REROUTE_INTERRUPT as appropriate rather than
the complicated #ifdefs.
Notes
Notes:
svn path=/head/; revision=153956
Diffstat (limited to 'sys/dev/pci/pci.c')
| -rw-r--r-- | sys/dev/pci/pci.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 4a661daef6b1..89facc8cca27 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -60,8 +60,7 @@ __FBSDID("$FreeBSD$"); #include "pcib_if.h" #include "pci_if.h" -#if (defined(__i386__) && !defined(PC98)) || defined(__amd64__) || \ - defined (__ia64__) +#ifdef __HAVE_ACPI #include <contrib/dev/acpica/acpi.h> #include "acpi_if.h" #else @@ -1092,8 +1091,7 @@ pci_add_resources(device_t bus, device_t dev, int force, uint32_t prefetchmask) } if (cfg->intpin > 0 && PCI_INTERRUPT_VALID(cfg->intline)) { -#if defined(__ia64__) || defined(__i386__) || defined(__amd64__) || \ - defined(__arm__) || defined(__alpha__) +#ifdef __PCI_REROUTE_INTERRUPT /* * Try to re-route interrupts. Sometimes the BIOS or * firmware may leave bogus values in these registers. |