Skip to content
Commit 4f3731da authored by Tony Breeds's avatar Tony Breeds Committed by Linus Torvalds
Browse files

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: default avatarTony Breeds <tony@bakeyournoodle.com>
Tested-by: default avatarBret Towe <magnade@gmail.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8b4a4080
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment