vserver 2.0 rc7

[linux-2.6.git] / arch / ppc / platforms / chrp_setup.c

diff --git a/arch/ppc/platforms/chrp_setup.c b/arch/ppc/platforms/chrp_setup.c
index 163df2a..57f29ab 100644 (file)
--- a/arch/ppc/platforms/chrp_setup.c
+++ b/arch/ppc/platforms/chrp_setup.c
@@ -356,7 +356,7 @@ static void __init chrp_find_openpic(void)
        struct device_node *np;
        int len, i;
        unsigned int *iranges;
-       void *isu;
+       void __iomem *isu;
 
        np = find_type_devices("open-pic");
        if (np == NULL || np->n_addrs == 0)
@@ -527,6 +527,8 @@ chrp_init(unsigned long r3, unsigned long r4, unsigned long r5,
 
        ppc_md.init           = chrp_init2;
 
+       ppc_md.phys_mem_access_prot = pci_phys_mem_access_prot;
+
        ppc_md.restart        = chrp_restart;
        ppc_md.power_off      = chrp_power_off;
        ppc_md.halt           = chrp_halt;