q3k
/
linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
linux/arch
History
Tony Breeds 4f3731da16 Fix compile failure in arch/powerpc/kernel/pci-common.c 
This fixes the fallout from the recent powerpc merge (commit
489de30259):

   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>
 		2007-07-18 10:17:39 -07:00
..
alpha missing exports of csum_... 2007-07-17 11:01:07 -07:00
arm csb337 supports "new style" rtc-ds1307 2007-07-17 10:23:09 -07:00
arm26 PTRACE_POKEDATA consolidation 2007-07-17 10:23:03 -07:00
avr32 PTRACE_POKEDATA consolidation 2007-07-17 10:23:03 -07:00
blackfin Blackfin arch: add missing CONFIG_LARGE_ALLOCS when upstream merging 2007-07-12 14:55:05 +08:00
cris PTRACE_POKEDATA consolidation 2007-07-17 10:23:03 -07:00
frv serial: add early_serial_setup() back to header file 2007-07-18 08:38:22 -07:00
h8300 PTRACE_POKEDATA consolidation 2007-07-17 10:23:03 -07:00
i386 arch/i386/* fs/* ipc/*: mark variables with uninitialized_var() 2007-07-17 16:23:19 -04:00
ia64 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 2007-07-17 11:31:57 -07:00
m32r PTRACE_POKEDATA consolidation 2007-07-17 10:23:03 -07:00
m68k missing exports of csum_... 2007-07-17 11:01:07 -07:00
m68knommu PTRACE_POKEDATA consolidation 2007-07-17 10:23:03 -07:00
mips serial: add early_serial_setup() back to header file 2007-07-18 08:38:22 -07:00
parisc kallsyms: make KSYM_NAME_LEN include space for trailing '\0' 2007-07-17 10:23:03 -07:00
powerpc Fix compile failure in arch/powerpc/kernel/pci-common.c 2007-07-18 10:17:39 -07:00
ppc serial: add early_serial_setup() back to header file 2007-07-18 08:38:22 -07:00
s390 Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 2007-07-17 15:29:33 -07:00
sh PTRACE_POKEDATA consolidation 2007-07-17 10:23:03 -07:00
sh64 missing exports of csum_... 2007-07-17 11:01:07 -07:00
sparc sparc32 has working dma-mapping only with CONFIG_PCI 2007-07-17 11:01:07 -07:00
sparc64 [SPARC64]: Kill bogus set_fs(KERNEL_DS) in do_rt_sigreturn(). 2007-07-17 14:37:54 -07:00
um um_kmalloc() remnants 2007-07-17 11:01:07 -07:00
v850 PTRACE_POKEDATA consolidation 2007-07-17 10:23:03 -07:00
x86_64 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm 2007-07-17 11:50:26 -07:00
xtensa PTRACE_POKEDATA consolidation 2007-07-17 10:23:03 -07:00