Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / arch / powerpc / kernel / machine_kexec_64.c

diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c
index d7f6090..7206701 100644 (file)
--- a/arch/powerpc/kernel/machine_kexec_64.c
+++ b/arch/powerpc/kernel/machine_kexec_64.c
@@ -389,14 +389,14 @@ static int __init export_htab_values(void)
        /* remove any stale propertys so ours can be found */
        prop = of_find_property(node, htab_base_prop.name, NULL);
        if (prop)
-               prom_remove_property(node, prop);
+               of_remove_property(node, prop);
        prop = of_find_property(node, htab_size_prop.name, NULL);
        if (prop)
-               prom_remove_property(node, prop);
+               of_remove_property(node, prop);
 
        htab_base = __pa(htab_address);
-       prom_add_property(node, &htab_base_prop);
-       prom_add_property(node, &htab_size_prop);
+       of_add_property(node, &htab_base_prop);
+       of_add_property(node, &htab_size_prop);
 
        of_node_put(node);
        return 0;