diff options
Diffstat (limited to 'arch/powerpc/kernel/prom.c')
-rw-r--r-- | arch/powerpc/kernel/prom.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index deccd91d7e81..1ed2ec2ea05b 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c | |||
@@ -778,7 +778,7 @@ struct device_node *of_find_node_by_phandle(phandle handle) | |||
778 | 778 | ||
779 | read_lock(&devtree_lock); | 779 | read_lock(&devtree_lock); |
780 | for (np = allnodes; np != 0; np = np->allnext) | 780 | for (np = allnodes; np != 0; np = np->allnext) |
781 | if (np->linux_phandle == handle) | 781 | if (np->phandle == handle) |
782 | break; | 782 | break; |
783 | of_node_get(np); | 783 | of_node_get(np); |
784 | read_unlock(&devtree_lock); | 784 | read_unlock(&devtree_lock); |
@@ -907,9 +907,9 @@ static int of_finish_dynamic_node(struct device_node *node) | |||
907 | if (machine_is(powermac)) | 907 | if (machine_is(powermac)) |
908 | return -ENODEV; | 908 | return -ENODEV; |
909 | 909 | ||
910 | /* fix up new node's linux_phandle field */ | 910 | /* fix up new node's phandle field */ |
911 | if ((ibm_phandle = of_get_property(node, "ibm,phandle", NULL))) | 911 | if ((ibm_phandle = of_get_property(node, "ibm,phandle", NULL))) |
912 | node->linux_phandle = *ibm_phandle; | 912 | node->phandle = *ibm_phandle; |
913 | 913 | ||
914 | out: | 914 | out: |
915 | of_node_put(parent); | 915 | of_node_put(parent); |