summaryrefslogtreecommitdiffstats
path: root/scripts/dtc/data.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2009-12-01 08:16:22 +0100
committerHerbert Xu <herbert@gondor.apana.org.au>2009-12-01 08:16:22 +0100
commit838632438145ac6863377eb12d8b8eef9c55d288 (patch)
treefbb0757df837f3c75a99c518a3596c38daef162d /scripts/dtc/data.c
parenthwrng: core - Replace u32 in driver API with byte array (diff)
parentMerge branch 'security' of git://git.kernel.org/pub/scm/linux/kernel/git/linv... (diff)
downloadlinux-838632438145ac6863377eb12d8b8eef9c55d288.tar.xz
linux-838632438145ac6863377eb12d8b8eef9c55d288.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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;