d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use __HAVE_ACPI and __PCI_REROUTE_INTERRUPT as appropriate rather than

Browse Source 
the complicated #ifdefs.
This commit is contained in:
Warner Losh 2006-01-01 21:04:31 +00:00
parent 501755f4f6
commit a48895a77e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=153956
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/pci/pci.c
View File

@ -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.