[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: Rune Torgersen <runet@innovsys.com>
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h
index f68a05ac836fa2ac3d62f871990aa79416e7b614..fb514f700e65dc6551e9212d857efa0b1b59160a 100644 (file)
--- a/include/asm-ppc/io.h
+++ b/include/asm-ppc/io.h
@@ -360,6 +360,7 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src, int
 {
        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(unsigned long address)
        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.