summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-01-16 20:42:43 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-16 11:56:26 -0800
commitfc8fe1e992ae0326a88edbe4d6793e840bbdd4ff (patch)
tree40eb3f1660898b9261219c0c256f569f0258a953
parentf8206b925fb0eba3a11839419be118b09105d7b1 (diff)
downloadop-kernel-dev-fc8fe1e992ae0326a88edbe4d6793e840bbdd4ff.zip
op-kernel-dev-fc8fe1e992ae0326a88edbe4d6793e840bbdd4ff.tar.gz
PCI / ACPI: Fix build of the AER driver for CONFIG_ACPI unset
After commit 415e12b23792 ("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>
-rw-r--r--include/linux/pci-acpi.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h
index 479d9bb..4462350 100644
--- a/include/linux/pci-acpi.h
+++ b/include/linux/pci-acpi.h
@@ -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
OpenPOWER on IntegriCloud