diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2009-10-18 01:09:09 +0200 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2009-10-18 01:12:33 +0200 |
| commit | 0f8f86c7bdd1c954fbe153af437a0d91a6c5721a (patch) | |
| tree | 94a8d419a470a4f9852ca397bb9bbe48db92ff5c /usr | |
| parent | dca2d6ac09d9ef59ff46820d4f0c94b08a671202 (diff) | |
| parent | f39cdf25bf77219676ec5360980ac40b1a7e144a (diff) | |
Merge commit 'perf/core' into perf/hw-breakpoint
Conflicts:
kernel/Makefile
kernel/trace/Makefile
kernel/trace/trace.h
samples/Makefile
Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/.gitignore | 2 | ||||
| -rw-r--r-- | usr/Makefile | 2 | ||||
| -rw-r--r-- | usr/gen_init_cpio.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/usr/.gitignore b/usr/.gitignore index 69b2e89fa16..8e48117a3f3 100644 --- a/usr/.gitignore +++ b/usr/.gitignore @@ -4,5 +4,7 @@ gen_init_cpio initramfs_data.cpio initramfs_data.cpio.gz +initramfs_data.cpio.bz2 +initramfs_data.cpio.lzma initramfs_list include diff --git a/usr/Makefile b/usr/Makefile index 245145a99c1..1e6a9e4a72c 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -6,7 +6,7 @@ klibcdirs:; PHONY += klibcdirs -# Gzip, but no bzip2 +# Gzip suffix_$(CONFIG_INITRAMFS_COMPRESSION_GZIP) = .gz # Bzip2 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" |