X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=Makefile;h=ab80be7a38bca0261b2adc49e878f00fea113dcd;hb=4dd322bc3b25be40dfa91e8ac483b846f3e8dffc;hp=89cee8625651ae75809a610ad7d08f1644268325;hpb=5263f0a88076ab32b3120356645734918bdc1700;p=linux-2.6-block.git

diff --git a/Makefile b/Makefile
index 89cee8625651..ab80be7a38bc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 3
 PATCHLEVEL = 13
 SUBLEVEL = 0
-EXTRAVERSION = -rc4
+EXTRAVERSION = -rc6
 NAME = One Giant Leap for Frogkind
 
 # *DOCUMENTATION*
@@ -738,7 +738,9 @@ INITRD_COMPRESS-$(CONFIG_RD_LZMA)  := lzma
 INITRD_COMPRESS-$(CONFIG_RD_XZ)    := xz
 INITRD_COMPRESS-$(CONFIG_RD_LZO)   := lzo
 INITRD_COMPRESS-$(CONFIG_RD_LZ4)   := lz4
-export INITRD_COMPRESS := $(INITRD_COMPRESS-y)
+# do not export INITRD_COMPRESS, since we didn't actually
+# choose a sane default compression above.
+# export INITRD_COMPRESS := $(INITRD_COMPRESS-y)
 
 ifdef CONFIG_MODULE_SIG_ALL
 MODSECKEY = ./signing_key.priv