Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

[linux-2.6] / include / asm-powerpc / io.h

diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h
index 17efea5b594c3e046575ec0c0be1611f0b124f03..bb8d965f96c6bc42969c51009fe38ba7f12b371d 100644 (file)
--- a/include/asm-powerpc/io.h
+++ b/include/asm-powerpc/io.h
@@ -633,13 +633,6 @@ extern void __iomem * __ioremap_at(phys_addr_t pa, void *ea,
                                   unsigned long size, unsigned long flags);
 extern void __iounmap_at(void *ea, unsigned long size);
 
-/* Those are more 32 bits only functions */
-extern unsigned long iopa(unsigned long addr);
-extern unsigned long mm_ptov(unsigned long addr) __attribute_const__;
-extern void io_block_mapping(unsigned long virt, phys_addr_t phys,
-                            unsigned int size, int flags);
-
-
 /*
  * When CONFIG_PPC_INDIRECT_IO is set, we use the generic iomap implementation
  * which needs some additional definitions here. They basically allow PIO