Commit 6a0141a0 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'devicetree-fixes-for-5.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

Pull Devicetree fix from Rob Herring:
 "A single build fix for powerpc due to device_node.type removal"

* tag 'devicetree-fixes-for-5.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  powerpc: chrp: Use of_node_is_type to access device_type
parents 26caabbc 75a080cd
...@@ -538,8 +538,7 @@ static void __init chrp_init_IRQ(void) ...@@ -538,8 +538,7 @@ static void __init chrp_init_IRQ(void)
/* see if there is a keyboard in the device tree /* see if there is a keyboard in the device tree
with a parent of type "adb" */ with a parent of type "adb" */
for_each_node_by_name(kbd, "keyboard") for_each_node_by_name(kbd, "keyboard")
if (kbd->parent && kbd->parent->type if (of_node_is_type(kbd->parent, "adb"))
&& strcmp(kbd->parent->type, "adb") == 0)
break; break;
of_node_put(kbd); of_node_put(kbd);
if (kbd) if (kbd)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment