VisionFive2 Linux kernel

author: Linus Torvalds <torvalds@linux-foundation.org> 2009-09-23 15:37:02 -0700 committer: Linus Torvalds <torvalds@linux-foundation.org> 2009-09-23 15:37:02 -0700 commit: c37efa932598de5e30330a1414e34d9e082e0d9e parent: 9e12a7e7d89ad813d01092890010cf67d0f914bd

Commit Summary:

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next

Diffstat:

2 files changed, 3 insertions, 1 deletion

diff --git a/usr/.gitignore b/usr/.gitignore
index 69b2e89fa165..8e48117a3f3d 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 245145a99c10..1e6a9e4a72cc 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