diff options
| author |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-15 15:02:44 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-15 15:02:44 +1100 |
| commit | de1bb03af7f4dde8e0e823629909d179fed4beff (patch) | |
| tree | 4ea86f8e160b8ea5c9689883c7f7da1536f5294b /arch/powerpc/platforms/85xx | |
| parent | powerpc: Fix CONFIG_RELOCATABLE=y CONFIG_CRASH_DUMP=n build (diff) | |
| parent | powerpc+of: Remove the pSeries_reconfig.h file (diff) | |
| download | linux-dev-de1bb03af7f4dde8e0e823629909d179fed4beff.tar.xz linux-dev-de1bb03af7f4dde8e0e823629909d179fed4beff.zip | |
Merge branch 'dt' into next
Diffstat (limited to 'arch/powerpc/platforms/85xx')
| -rw-r--r-- | arch/powerpc/platforms/85xx/p1022_ds.c | 6 |
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 848a3e98e1c1..8fb12570b2f5 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); } |