PCI / ACPI: Fix build of the AER driver for CONFIG_ACPI unset
authorRafael J. Wysocki <rjw@sisk.pl>
Sun, 16 Jan 2011 19:42:43 +0000 (20:42 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 16 Jan 2011 19:56:26 +0000 (11:56 -0800)
commitfc8fe1e992ae0326a88edbe4d6793e840bbdd4ff
tree40eb3f1660898b9261219c0c256f569f0258a953
parentf8206b925fb0eba3a11839419be118b09105d7b1
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>
include/linux/pci-acpi.h