Messages in this thread | | | From | Bjorn Helgaas <> | Date | Tue, 11 Sep 2012 08:28:39 -0600 | Subject | Re: linux-next: build failure after merge of the pci tree |
| |
On Mon, Sep 10, 2012 at 7:29 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > Hi Bjorn, > > After merging the pci tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: > > arch/powerpc/platforms/powernv/pci-ioda.c: In function 'pnv_pci_window_alignment': > arch/powerpc/platforms/powernv/pci-ioda.c:1163:13: error: 'struct pci_dev' has no member named 'pcie_type' > > Caused by commit ac161fbfdaa2 ("powerpc/powernv: I/O and memory alignment > for P2P bridges"). pcie_type was removed in commit b2ef39be5744 ("PCI: > Remove unused field pcie_type from struct pci_dev") (also in the pci > tree). > > I have used the pci tree from next-20120910 for today.
Thanks.
Gavin, Ben, I folded in the trivial fix and updated both my pci/gavin-window-alignment and next branches.
Ben, I think you'll need to pull in pci/jiang-pcie-cap before pci/gavin-window-alignment to get both pieces.
Bjorn
| |