Skip to content

Commit

Permalink
PCI / ACPI: Fix build of the AER driver for CONFIG_ACPI unset
Browse files Browse the repository at this point in the history
After commit 415e12b ("PCI/ACPI: Request _OSC control once for each
root bridge (v3)") include/linux/pci-acpi.h is included by
drivers/pci/pcie/aer/aerdrv.c and if CONFIG_ACPI is unset, the bogus and
unnecessary alternative definition of acpi_find_root_bridge_handle()
causes a build error to occur.

Remove the offending piece of garbage.

Reported-and-tested-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
rjwysocki authored and torvalds committed Jan 16, 2011
1 parent f8206b9 commit fc8fe1e
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions include/linux/pci-acpi.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus)
return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus),
pbus->number);
}
#else
static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
{ return NULL; }
#endif

#ifdef CONFIG_ACPI_APEI
Expand Down

0 comments on commit fc8fe1e

Please sign in to comment.