diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 17:35:44 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 17:35:44 (GMT) |
| commit | 8901e7ffc2fa78ede7ce9826dbad68a3a25dc2dc (patch) | |
| tree | e1a7735557b8d875e5827f889e658d3b5a717848 /usr/Makefile | |
| parent | 90975ef71246c5c688ead04e8ff6f36dc92d28b3 (diff) | |
| parent | 1359096eacb1971be67eead8bf9b582864d92a30 (diff) | |
| download | linux-fsl-qoriq-8901e7ffc2fa78ede7ce9826dbad68a3a25dc2dc.tar.xz | |
Merge branch 'bzip2-lzma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip
* 'bzip2-lzma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip:
bzip2/lzma: quiet Kconfig warning for INITRAMFS_COMPRESSION_NONE
Diffstat (limited to 'usr/Makefile')
| -rw-r--r-- | usr/Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/usr/Makefile b/usr/Makefile index b84894b..245145a 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -6,9 +6,6 @@ klibcdirs:; PHONY += klibcdirs -# No compression -suffix_$(CONFIG_INITRAMFS_COMPRESSION_NONE) = - # Gzip, but no bzip2 suffix_$(CONFIG_INITRAMFS_COMPRESSION_GZIP) = .gz |