Re: [PATCH] Re: 2.6.22-git ppc build failure

["Bret Towe" <magnade@gmail.com>]

On 7/17/07, Tony Breeds <tony@bakeyournoodle.com> wrote:
> On Tue, Jul 17, 2007 at 11:04:57AM -0700, Bret Towe wrote:
> > this is off my g4 mac mini
> > latest git as of when this email was sent
> > config file attached
>
> Hi Bret,
>         the patch below will fix it.

yeap it compiled and boots fine
thanks


> From: Tony Breeds <tony@bakeyournoodle.com>
>
> Fix compile failure in arch/powerpc/kernel/pci-common.c
>
>  CC      arch/powerpc/kernel/pci-common.o
> arch/powerpc/kernel/pci-common.c:160: error: conflicting types for 'pcibios_add_platform_entries'
> include/linux/pci.h:889: error: previous declaration of 'pcibios_add_platform_entries' was here
>
> Fallout from the powerpc merge (489de30259e667d7bc47da9da44a0270b050cd97).
>
> Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
>
> ---
>  arch/powerpc/kernel/pci-common.c |    7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> Index: working/arch/powerpc/kernel/pci-common.c
> ===================================================================
> --- working.orig/arch/powerpc/kernel/pci-common.c       2007-07-18 10:34:55.000000000 +1000
> +++ working/arch/powerpc/kernel/pci-common.c    2007-07-18 10:39:19.000000000 +1000
> @@ -156,11 +156,14 @@ static DEVICE_ATTR(devspec, S_IRUGO, pci
>  #endif /* CONFIG_PPC_OF */
>
>  /* Add sysfs properties */
> -void pcibios_add_platform_entries(struct pci_dev *pdev)
> +int pcibios_add_platform_entries(struct pci_dev *pdev)
>  {
>  #ifdef CONFIG_PPC_OF
> -       device_create_file(&pdev->dev, &dev_attr_devspec);
> +       return device_create_file(&pdev->dev, &dev_attr_devspec);
> +#else
> +       return 0;
>  #endif /* CONFIG_PPC_OF */
> +
>  }
>
>  char __init *pcibios_setup(char *str)
>
> Yours Tony
>
>   linux.conf.au        http://linux.conf.au/ || http://lca2008.linux.org.au/
>   Jan 28 - Feb 02 2008 The Australian Linux Technical Conference!
>
>