dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Linus Torvalds 2009-04-05 10:35:44 -07:00
parent 90975ef712 1359096eac
commit 8901e7ffc2
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
usr/Kconfig
View File

@ -72,10 +72,8 @@ config RD_LZMA
Support loading of a LZMA encoded initial ramdisk or cpio buffer
If unsure, say N.
if INITRAMFS_SOURCE!=""
choice
prompt "Built-in initramfs compression mode"
prompt "Built-in initramfs compression mode" if INITRAMFS_SOURCE!=""
help
This option decides by which algorithm the builtin initramfs
will be compressed. Several compression algorithms are
@ -134,14 +132,3 @@ config INITRAMFS_COMPRESSION_LZMA
smaller with LZMA in comparison to gzip.
endchoice
endif
if INITRAMFS_SOURCE=""
# The builtin initramfs is so small so we don't want to bug the user...
config INITRAMFS_COMPRESSION_NONE
bool
default y
endif

3
usr/Makefile
View File

@ -6,9 +6,6 @@ klibcdirs:;
PHONY += klibcdirs
# No compression
suffix_$(CONFIG_INITRAMFS_COMPRESSION_NONE) =
# Gzip, but no bzip2
suffix_$(CONFIG_INITRAMFS_COMPRESSION_GZIP) = .gz