summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/85xx
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-11-15 15:02:44 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-11-15 15:02:44 +1100
commitde1bb03af7f4dde8e0e823629909d179fed4beff (patch)
tree4ea86f8e160b8ea5c9689883c7f7da1536f5294b /arch/powerpc/platforms/85xx
parent11ee7e99f35ecb15f59b21da6a82d96d2cd3fcc8 (diff)
parentf459d63e1689b16a2f5a965557e19b25bad5dbdc (diff)
downloadop-kernel-dev-de1bb03af7f4dde8e0e823629909d179fed4beff.zip
op-kernel-dev-de1bb03af7f4dde8e0e823629909d179fed4beff.tar.gz
Merge branch 'dt' into next
Diffstat (limited to 'arch/powerpc/platforms/85xx')
-rw-r--r--arch/powerpc/platforms/85xx/p1022_ds.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c
index 848a3e9..8fb1257 100644
--- a/arch/powerpc/platforms/85xx/p1022_ds.c
+++ b/arch/powerpc/platforms/85xx/p1022_ds.c
@@ -539,7 +539,7 @@ static void __init p1022_ds_setup_arch(void)
};
/*
- * prom_update_property() is called before
+ * of_update_property() is called before
* kmalloc() is available, so the 'new' object
* should be allocated in the global area.
* The easiest way is to do that is to
@@ -548,7 +548,7 @@ static void __init p1022_ds_setup_arch(void)
*/
pr_info("p1022ds: disabling %s node",
np2->full_name);
- prom_update_property(np2, &nor_status);
+ of_update_property(np2, &nor_status);
of_node_put(np2);
}
@@ -564,7 +564,7 @@ static void __init p1022_ds_setup_arch(void)
pr_info("p1022ds: disabling %s node",
np2->full_name);
- prom_update_property(np2, &nand_status);
+ of_update_property(np2, &nand_status);
of_node_put(np2);
}
OpenPOWER on IntegriCloud