summaryrefslogtreecommitdiff
path: root/scripts/dtc/data.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2009-11-23 20:34:58 +0300
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-11-23 20:34:58 +0300
commit9b8b317d58084b9a44f6f33b355c4278d9f841fb (patch)
treee0df89800bf4301c4017db3cdf04a2056ec1a852 /scripts/dtc/data.c
parent78c210efdefe07131f91ed512a3308b15bb14e2f (diff)
parent648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff)
downloadlinux-9b8b317d58084b9a44f6f33b355c4278d9f841fb.tar.xz
Merge commit 'v2.6.32-rc8' into HEAD
Diffstat (limited to 'scripts/dtc/data.c')
-rw-r--r--scripts/dtc/data.c2
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,
return d;
}
-struct data data_append_markers(struct data d, struct marker *m)
+static struct data data_append_markers(struct data d, struct marker *m)
{
struct marker **mp = &d.markers;