Pull dock into release branch

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

diff --git a/include/asm-powerpc/machdep.h b/include/asm-powerpc/machdep.h
index 8c1a2dfe5cc7a652b306d75edc978e6b80e6945d..1b04e57235482ae59f276c89a9bbc6e0baa1ef4b 100644 (file)
--- a/include/asm-powerpc/machdep.h
+++ b/include/asm-powerpc/machdep.h
@@ -88,9 +88,9 @@ struct machdep_calls {
        void            (*pci_dma_dev_setup)(struct pci_dev *dev);
        void            (*pci_dma_bus_setup)(struct pci_bus *bus);
 
-       void __iomem *  (*ioremap)(unsigned long addr, unsigned long size,
+       void __iomem *  (*ioremap)(phys_addr_t addr, unsigned long size,
                                   unsigned long flags);
-       void            (*iounmap)(void __iomem *token);
+       void            (*iounmap)(volatile void __iomem *token);
 #endif /* CONFIG_PPC64 */
 
        int             (*probe)(void);