diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-10-01 11:20:33 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-10-01 11:20:48 +0200 |
commit | 0aa73ba1c4e1ad1d51a29e0df95ccd9f746918b6 (patch) | |
tree | f0714ddcd02812b4fbe3b5405df9e4068f5587e2 /usr/gen_init_cpio.c | |
parent | 925936ebf35a95c290e010b784c962164e6728f3 (diff) | |
parent | 33974093c024f08caadd2fc71a83bd811ed1831d (diff) | |
download | kernel-crypto-0aa73ba1c4e1ad1d51a29e0df95ccd9f746918b6.tar.gz kernel-crypto-0aa73ba1c4e1ad1d51a29e0df95ccd9f746918b6.tar.xz kernel-crypto-0aa73ba1c4e1ad1d51a29e0df95ccd9f746918b6.zip |
Merge branch 'tracing/urgent' into tracing/core
Merge reason: Pick up latest fixes and update to latest upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'usr/gen_init_cpio.c')
-rw-r--r-- | usr/gen_init_cpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c index f1d3fe34176..83b3dde1a83 100644 --- a/usr/gen_init_cpio.c +++ b/usr/gen_init_cpio.c @@ -446,7 +446,7 @@ static int cpio_mkfile_line(const char *line) return rc; } -void usage(const char *prog) +static void usage(const char *prog) { fprintf(stderr, "Usage:\n" "\t%s <cpio_list>\n" |