projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[cascardo/linux.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
dfe559c
..
34210af
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,7
@@
VERSION = 2
PATCHLEVEL = 6
VERSION = 2
PATCHLEVEL = 6
-SUBLEVEL = 2
1
-EXTRAVERSION =
+SUBLEVEL = 2
2
+EXTRAVERSION =
-rc2
NAME = Nocturnal Monster Puppy
# *DOCUMENTATION*
NAME = Nocturnal Monster Puppy
# *DOCUMENTATION*
@@
-491,7
+491,7
@@
endif
include $(srctree)/arch/$(ARCH)/Makefile
ifdef CONFIG_FRAME_POINTER
include $(srctree)/arch/$(ARCH)/Makefile
ifdef CONFIG_FRAME_POINTER
-CFLAGS += -fno-omit-frame-pointer
-fno-optimize-sibling-calls
+CFLAGS += -fno-omit-frame-pointer
$(call cc-option,-fno-optimize-sibling-calls,)
else
CFLAGS += -fomit-frame-pointer
endif
else
CFLAGS += -fomit-frame-pointer
endif