]> err.no Git - linux-2.6/commit
Fix compile failure in arch/powerpc/kernel/pci-common.c
authorTony Breeds <tony@bakeyournoodle.com>
Wed, 18 Jul 2007 01:03:55 +0000 (11:03 +1000)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 18 Jul 2007 17:17:39 +0000 (10:17 -0700)
commit4f3731da16678026a564b1d7ae218131e4af6810
tree638a7a36aba3d287d8235c6a5c5832c0ba04cc2e
parent8b4a40809e5330c9da5d20107d693d92d73b31dc
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>
arch/powerpc/kernel/pci-common.c