From: Tony Breeds <tony@bakeyournoodle.com>
Date: Wed, 18 Jul 2007 01:03:55 +0000 (+1000)
Subject: Fix compile failure in arch/powerpc/kernel/pci-common.c
X-Git-Tag: v2.6.23-rc1~500
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f3731da16678026a564b1d7ae218131e4af6810;p=pandora-kernel.git

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

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

   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>
---

Reading git-diff-tree failed