Commit f2dbdbf8 authored by Tom Rini's avatar Tom Rini Committed by Linus Torvalds

[PATCH] ppc32: fixup of previous PCI9 patch

Previous PCI9 patch had a #endif placed wrong for some unknown reason (was
correct in local tree) This fixes it.
Signed-off-by: default avatarRune Torgersen <runet@innovsys.com>
Signed-off-by: default avatarTom Rini <trini@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d23b7e0d
...@@ -360,6 +360,7 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src, int ...@@ -360,6 +360,7 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src, int
{ {
memcpy((void __force *) dst, src, count); 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)) #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(unsigned long address) ...@@ -408,7 +409,7 @@ extern inline void * bus_to_virt(unsigned long address)
return (void*) mm_ptov (address); return (void*) mm_ptov (address);
#endif #endif
} }
#endif
/* /*
* Change virtual addresses to physical addresses and vv, for * Change virtual addresses to physical addresses and vv, for
* addresses in the area where the kernel has the RAM mapped. * addresses in the area where the kernel has the RAM mapped.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment