summary refs log tree commit diff
path: root/usr/Kconfig
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-03-31 12:24:17 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-03-31 23:51:56 -0700
commit1359096eacb1971be67eead8bf9b582864d92a30 (patch)
tree5c43092ccdfc25d060893b163e50204b0f65b435 /usr/Kconfig
parent15f7176eb1cccec0a332541285ee752b935c1c85 (diff)
downloadlinux-1359096eacb1971be67eead8bf9b582864d92a30.tar.gz
bzip2/lzma: quiet Kconfig warning for INITRAMFS_COMPRESSION_NONE
Impact: quiet Kconfig warning

It appears that Kconfig simply has no way to provide defaults for
entries that exist inside a conditionalized choice block.
Fortunately, it turns out we don't actually ever use
CONFIG_INITRAMFS_COMPRESSION_NONE, so we can just drop it for
everything outside the choice block.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'usr/Kconfig')
-rw-r--r--usr/Kconfig15
1 files changed, 1 insertions, 14 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