diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-03-23 10:13:15 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-03-23 10:13:15 (GMT) |
commit | e4518ab90f63cd5bea3ddc15341162debc34442b (patch) | |
tree | fcefaeced9562de840bbf11ec2ffc95e1d9a571f /drivers/of/overlay.c | |
parent | c56716af8d27ca8dd6e45445ae1c0a05fd9753a6 (diff) | |
parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff) | |
download | linux-e4518ab90f63cd5bea3ddc15341162debc34442b.tar.xz |
Merge tag 'v4.0-rc5' into x86/asm, to resolve conflicts
Conflicts:
arch/x86/kernel/entry_64.S
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/of/overlay.c')
-rw-r--r-- | drivers/of/overlay.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 352b4f2..dee9270 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -19,6 +19,7 @@ #include <linux/string.h> #include <linux/slab.h> #include <linux/err.h> +#include <linux/idr.h> #include "of_private.h" @@ -85,7 +86,7 @@ static int of_overlay_apply_single_device_node(struct of_overlay *ov, struct device_node *target, struct device_node *child) { const char *cname; - struct device_node *tchild, *grandchild; + struct device_node *tchild; int ret = 0; cname = kbasename(child->full_name); |