diff options
Diffstat (limited to 'scripts/dtc')
-rw-r--r-- | scripts/dtc/libfdt/libfdt.h | 2 | ||||
-rw-r--r-- | scripts/dtc/livetree.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/dtc/libfdt/libfdt.h b/scripts/dtc/libfdt/libfdt.h index ce80e4fb41b2..ff6246f000ce 100644 --- a/scripts/dtc/libfdt/libfdt.h +++ b/scripts/dtc/libfdt/libfdt.h | |||
@@ -61,7 +61,7 @@ | |||
61 | #define FDT_ERR_NOTFOUND 1 | 61 | #define FDT_ERR_NOTFOUND 1 |
62 | /* FDT_ERR_NOTFOUND: The requested node or property does not exist */ | 62 | /* FDT_ERR_NOTFOUND: The requested node or property does not exist */ |
63 | #define FDT_ERR_EXISTS 2 | 63 | #define FDT_ERR_EXISTS 2 |
64 | /* FDT_ERR_EXISTS: Attemped to create a node or property which | 64 | /* FDT_ERR_EXISTS: Attempted to create a node or property which |
65 | * already exists */ | 65 | * already exists */ |
66 | #define FDT_ERR_NOSPACE 3 | 66 | #define FDT_ERR_NOSPACE 3 |
67 | /* FDT_ERR_NOSPACE: Operation needed to expand the device | 67 | /* FDT_ERR_NOSPACE: Operation needed to expand the device |
diff --git a/scripts/dtc/livetree.c b/scripts/dtc/livetree.c index c9209d5c999e..26d0e1e60c0c 100644 --- a/scripts/dtc/livetree.c +++ b/scripts/dtc/livetree.c | |||
@@ -155,7 +155,7 @@ struct node *merge_nodes(struct node *old_node, struct node *new_node) | |||
155 | } | 155 | } |
156 | } | 156 | } |
157 | 157 | ||
158 | /* if no collision occured, add child to the old node. */ | 158 | /* if no collision occurred, add child to the old node. */ |
159 | if (new_child) | 159 | if (new_child) |
160 | add_child(old_node, new_child); | 160 | add_child(old_node, new_child); |
161 | } | 161 | } |