Commit fc8fe1e9 authored Jan 16, 2011 by Rafael J. Wysocki Committed by Linus Torvalds Jan 16, 2011

PCI / ACPI: Fix build of the AER driver for CONFIG_ACPI unset



After commit 415e12b2 ("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>

parent f8206b92

include/linux/pci-acpi.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -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

Admin message