--- linux-2.5/include/asm-ppc/io.h 2005-02-16 10:13:07.846116320 -0600 +++ linux-innsys-2.6.9/include/asm-ppc/io.h 2005-02-16 10:32:07.000000000 -0600 @@ -360,6 +360,7 @@ static inline void memcpy_toio(volatile { memcpy((void __force *) dst, src, count); } +#endif #define eth_io_copy_and_sum(a,b,c,d) eth_copy_and_sum((a),(void __force *)(void __iomem *)(b),(c),(d)) @@ -408,7 +409,7 @@ extern inline void * bus_to_virt(unsigne return (void*) mm_ptov (address); #endif } -#endif + /* * Change virtual addresses to physical addresses and vv, for * addresses in the area where the kernel has the RAM mapped.