On 2015/3/6 22:19, Rob Herring wrote: > On Fri, Mar 6, 2015 at 3:33 AM, Yijing Wang <[email protected]> wrote: >> Now we could use pci_scan_host_bridge() to scan >> pci buses, provide powerpc specific pci_host_bridge_ops. >> >> Suggested-by: Arnd Bergmann <[email protected]> >> Signed-off-by: Yijing Wang <[email protected]> >> CC: Benjamin Herrenschmidt <[email protected]> >> CC: [email protected] >> Signed-off-by: Bjorn Helgaas <[email protected]> >> --- >> arch/powerpc/include/asm/machdep.h | 2 +- >> arch/powerpc/kernel/pci-common.c | 63 >> ++++++++++++++++++------------ >> arch/powerpc/platforms/pseries/pci.c | 8 ++-- >> arch/powerpc/platforms/pseries/pseries.h | 2 +- >> 4 files changed, 44 insertions(+), 31 deletions(-) >> >> diff --git a/arch/powerpc/include/asm/machdep.h >> b/arch/powerpc/include/asm/machdep.h >> index 8e7f2a8..b811d12 100644 >> --- a/arch/powerpc/include/asm/machdep.h >> +++ b/arch/powerpc/include/asm/machdep.h >> @@ -129,7 +129,7 @@ struct machdep_calls { >> void (*pcibios_fixup)(void); >> int (*pci_probe_mode)(struct pci_bus *); >> void (*pci_irq_fixup)(struct pci_dev *dev); >> - int (*pcibios_set_root_bus_speed)(struct pci_host_bridge >> + void (*pcibios_set_root_bus_speed)(struct pci_host_bridge >> *bridge); > > Shouldn't this be part of patch 15?
Hi Rob, I didn't merge this to patch 15 for building happy for patch 15. > > Rob > > . > -- Thanks! Yijing -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
