diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-24 01:16:30 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-24 01:16:30 -0500 |
| commit | 1e43bee9c70654b4d52472c19e5f0a0cc18b6b36 (patch) | |
| tree | ff601ec0c0d14125d0324f21b3c7e6d5e19fa252 /scripts/dtc/data.c | |
| parent | 7d6709a20866a885916214590b7c394a21be9e25 (diff) | |
| parent | a8a8a669ea13d792296737505adc43ccacf3a648 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'scripts/dtc/data.c')
| -rw-r--r-- | scripts/dtc/data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/dtc/data.c b/scripts/dtc/data.c index dd2e3d39d4c1..fe555e819bf8 100644 --- a/scripts/dtc/data.c +++ b/scripts/dtc/data.c | |||
| @@ -217,7 +217,7 @@ struct data data_insert_at_marker(struct data d, struct marker *m, | |||
| 217 | return d; | 217 | return d; |
| 218 | } | 218 | } |
| 219 | 219 | ||
| 220 | struct data data_append_markers(struct data d, struct marker *m) | 220 | static struct data data_append_markers(struct data d, struct marker *m) |
| 221 | { | 221 | { |
| 222 | struct marker **mp = &d.markers; | 222 | struct marker **mp = &d.markers; |
| 223 | 223 | ||