diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 10:35:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 10:35:44 -0700 |
| commit | 8901e7ffc2fa78ede7ce9826dbad68a3a25dc2dc (patch) | |
| tree | e1a7735557b8d875e5827f889e658d3b5a717848 | |
| parent | 90975ef71246c5c688ead04e8ff6f36dc92d28b3 (diff) | |
| parent | 1359096eacb1971be67eead8bf9b582864d92a30 (diff) | |
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
| -rw-r--r-- | usr/Kconfig | 15 | ||||
| -rw-r--r-- | usr/Makefile | 3 |
2 files changed, 1 insertions, 17 deletions
diff --git a/usr/Kconfig b/usr/Kconfig index 588c588791e2..1c3039f28909 100644 --- a/usr/Kconfig +++ b/usr/Kconfig @@ -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 diff --git a/usr/Makefile b/usr/Makefile index b84894b3929d..245145a99c10 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 |