Commit 4f3731da authored Jul 18, 2007 by Tony Breeds Committed by Linus Torvalds Jul 18, 2007

Fix compile failure in arch/powerpc/kernel/pci-common.c



This fixes the fallout from the recent powerpc merge (commit
489de302):

   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

Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
Tested-by: Bret Towe <magnade@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 8b4a4080

arch/powerpc/kernel/pci-common.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -156,11 +156,14 @@ static DEVICE_ATTR(devspec, S_IRUGO, pci_show_devspec, NULL);
		#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)