[GIT PULL] bzip2/lzma Kconfig warning fix

[H. Peter Anvin]

Hi Linus,

This patch should take care of the annoying Kconfig warning from the
bzip2/lzma code.

The following changes since commit 15f7176eb1cccec0a332541285ee752b935c1c85:
  Linus Torvalds (1):
        Merge git://git.kernel.org/.../davem/net-2.6

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git bzip2-lzma-for-linus

H. Peter Anvin (1):
      bzip2/lzma: quiet Kconfig warning for INITRAMFS_COMPRESSION_NONE

 usr/Kconfig  |   15 +--------------
 usr/Makefile |    3 ---
 2 files changed, 1 insertions(+), 17 deletions(-)

commit 1359096eacb1971be67eead8bf9b582864d92a30
Author: H. Peter Anvin <hpa@xxxxxxxxx>
Date:   Tue Mar 31 12:24:17 2009 -0700

    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@xxxxxxxxx>

diff --git a/usr/Kconfig b/usr/Kconfig
index 588c588..1c3039f 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 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
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/