Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[pandora-kernel.git] / scripts / dtc / flattree.c

diff --git a/scripts/dtc/flattree.c b/scripts/dtc/flattree.c
index 28d0b23..665dad7 100644 (file)
--- a/scripts/dtc/flattree.c
+++ b/scripts/dtc/flattree.c
@@ -263,6 +263,9 @@ static void flatten_tree(struct node *tree, struct emitter *emit,
        struct node *child;
        int seen_name_prop = 0;
 
+       if (tree->deleted)
+               return;
+
        emit->beginnode(etarget, tree->labels);
 
        if (vi->flags & FTF_FULLPATH)