diff options
| author | Grant Likely | 2014-08-11 15:06:23 +0200 |
|---|---|---|
| committer | Grant Likely | 2014-08-11 15:06:23 +0200 |
| commit | 663d3f7c2e5e1b018a4c53277ccfde40329d98ca (patch) | |
| tree | a3afcc2d8fe682bdcc4c2e39b47ab3987b38c69a /arch/powerpc/platforms | |
| parent | Merge branch 'devicetree/next-console' into devicetree/next (diff) | |
| parent | of: typo fix in __of_prop_dup() (diff) | |
| download | kernel-qcow2-linux-663d3f7c2e5e1b018a4c53277ccfde40329d98ca.tar.gz kernel-qcow2-linux-663d3f7c2e5e1b018a4c53277ccfde40329d98ca.tar.xz kernel-qcow2-linux-663d3f7c2e5e1b018a4c53277ccfde40329d98ca.zip | |
Merge branch 'devicetree/next-overlay' into devicetree/next
Conflicts:
drivers/of/testcase-data/testcases.dts
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/pseries/hotplug-memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c index 7995135170a3..ac01e188faef 100644 --- a/arch/powerpc/platforms/pseries/hotplug-memory.c +++ b/arch/powerpc/platforms/pseries/hotplug-memory.c @@ -194,7 +194,7 @@ static int pseries_update_drconf_memory(struct of_prop_reconfig *pr) if (!memblock_size) return -EINVAL; - p = (u32 *)of_get_property(pr->dn, "ibm,dynamic-memory", NULL); + p = (u32 *) pr->old_prop->value; if (!p) return -EINVAL; |