On Wed, 1 Jul 2009 00:10:16 +0200 Ingo Molnar <mingo@xxxxxxx> wrote: > > * Luck, Tony <tony.luck@xxxxxxxxx> wrote: > > --- linux-2.6.31-rc1/arch/ia64/pci/pci.c 2009-06-26 > 17:49:37.000000000 +0200 +++ > 2.6.31-rc1-pcibios_setup/arch/ia64/pci/pci.c 2009-05-04 > 11:39:32.000000000 +0200 @@ -537,7 +537,7 @@ pcibios_align_resource > (void *data, stru /* > * PCI BIOS setup, always defaults to SAL interface > */ > -char * __devinit > +char * __init > pcibios_setup (char *str) > { > return str; > > ia64 part Acked-by: Tony Luck <tony.luck@xxxxxxxxx> > > Ingo/Thomas/Peter: please run this through the tip tree. > > I think this one's for Jesse's PCI tree. Stuffed it into my for-linus branch, thanks. -- Jesse Barnes, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-ia64" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
![]() |