# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2005/02/17 17:14:36-06:00 runet@pib.innsys.innovsys.com 
#   Fix compiler warnings generated when using PCI9 workaround
# 
# include/asm-ppc/mpc8260_pci9.h
#   2005/02/17 17:14:27-06:00 runet@pib.innsys.innovsys.com +1 -1
#   Updated declaration of memcpy_fromio to match normal case
# 
# arch/ppc/syslib/m8260_pci_erratum9.c
#   2005/02/17 17:14:27-06:00 runet@pib.innsys.innovsys.com +1 -2
#   Updated declaration of memcpy_fromio to match normal case
# 
diff -Nru a/arch/ppc/syslib/m8260_pci_erratum9.c b/arch/ppc/syslib/m8260_pci_erratum9.c
--- a/arch/ppc/syslib/m8260_pci_erratum9.c	2005-02-17 17:25:55 -06:00
+++ b/arch/ppc/syslib/m8260_pci_erratum9.c	2005-02-17 17:25:55 -06:00
@@ -374,7 +374,7 @@
 	idma_pci9_read((u8 *)buf, (u8 *)addr, nl*sizeof(u32), sizeof(u32), 0);
 }
 
-void *memcpy_fromio(void *dest, unsigned long src, size_t count)
+void memcpy_fromio(void *dest,const volatile void __iomem *src, int count)
 {
 	unsigned long pa = iopa((unsigned long) src);
 
@@ -382,7 +382,6 @@
 		idma_pci9_read((u8 *)dest, (u8 *)pa, count, 32, 1);
 	else
 		memcpy(dest, (void *)src, count);
-	return dest;
 }
 
 EXPORT_SYMBOL(readb);
diff -Nru a/include/asm-ppc/mpc8260_pci9.h b/include/asm-ppc/mpc8260_pci9.h
--- a/include/asm-ppc/mpc8260_pci9.h	2005-02-17 17:25:55 -06:00
+++ b/include/asm-ppc/mpc8260_pci9.h	2005-02-17 17:25:55 -06:00
@@ -45,7 +45,7 @@
 extern unsigned inl(unsigned port);
 extern void insw_ns(unsigned port, void *buf, int ns);
 extern void insl_ns(unsigned port, void *buf, int nl);
-extern void *memcpy_fromio(void *dest, unsigned long src, size_t count);
+extern void memcpy_fromio(void *dst,const volatile void __iomem *src, int count);
 
 #endif /* !__CONFIG_8260_PCI9_DEFS */
 #endif /* __KERNEL__ */