git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/ctxfi' into for-linus
[pandora-kernel.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
739fd34
..
03373bb
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,7
@@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 30
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 30
-EXTRAVERSION =
-rc7
+EXTRAVERSION =
NAME = Man-Eating Seals of Antiquity
# *DOCUMENTATION*
NAME = Man-Eating Seals of Antiquity
# *DOCUMENTATION*
@@
-533,7
+533,7
@@
endif
include $(srctree)/arch/$(SRCARCH)/Makefile
include $(srctree)/arch/$(SRCARCH)/Makefile
-ifneq (
CONFIG_FRAME_WARN
,0)
+ifneq (
$(CONFIG_FRAME_WARN)
,0)
KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN})
endif
KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN})
endif