linux-next: build failure after merge of the final tree (linus'tree related)

[Stephen Rothwell]

Hi all,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

In file included from drivers/pci/pcie/aer/aerdrv.c:20:
include/linux/pci-acpi.h:39: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'acpi_find_root_bridge_handle'

Caused by commit 415e12b2379239973feab91850b0dce985c6058a ("PCI/ACPI:
Request _OSC control once for each root bridge (v3)").  (Yet another
patch not seen in linux-next until merged into Linus' tree.  In this case
the breakage was not seen because the new part of the pci tree was
excluded from linux-next for several days because of another commit that
broke my builds.  That other commit was only excluded from the pci tree
just before being sent to Linus :-()

This is the non CONFIG_ACPI version of acpi_find_root_bridge_handle()
which returns an acpi_handle.  pci-acpi.h is now always included in
drivers/pci/pcie/aer/aerdrv.c.

I tried ifef'ing out the inclusion of pci-acpi.h, but that only made
matters worse.  I have just left it for today.  Please fix.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature