projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86, cpu: Detect more TLB configuration
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
89cee86
..
ab80be7
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,7
@@
VERSION = 3
PATCHLEVEL = 13
SUBLEVEL = 0
VERSION = 3
PATCHLEVEL = 13
SUBLEVEL = 0
-EXTRAVERSION = -rc
4
+EXTRAVERSION = -rc
6
NAME = One Giant Leap for Frogkind
# *DOCUMENTATION*
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
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
ifdef CONFIG_MODULE_SIG_ALL
MODSECKEY = ./signing_key.priv