diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-03 15:51:21 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-03 15:51:21 -0500 |
| commit | a6c872afb2536f47285e6643f4629dec7520041d (patch) | |
| tree | 4b54e69fc6594f9afc1277520a350db04e578e77 /scripts/dtc/data.c | |
| parent | 9fe02668fe48a1d546196bc1392330ff28d9bd57 (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
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 | ||