From: Andrew Morton arch/sparc/kernel/pcic.c:863: error: conflicting types for `pcibios_align_resource' include/linux/pci.h:407: error: previous declaration of `pcibios_align_resource' Cc: Vivek Goyal Cc: Greg KH Signed-off-by: Andrew Morton --- arch/sparc/kernel/pcic.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN arch/sparc/kernel/pcic.c~64-bit-resources-drivers-pci-changes-sparc32-fix arch/sparc/kernel/pcic.c --- 25-sparc/arch/sparc/kernel/pcic.c~64-bit-resources-drivers-pci-changes-sparc32-fix 2006-04-04 00:13:28.000000000 -0700 +++ 25-sparc-akpm/arch/sparc/kernel/pcic.c 2006-04-04 00:13:56.000000000 -0700 @@ -859,7 +859,7 @@ char * __init pcibios_setup(char *str) } void pcibios_align_resource(void *data, struct resource *res, - unsigned long size, unsigned long align) + u64 size, u64 align) { } _