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 git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
[pandora-kernel.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
f156f40
..
f3e2065
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,7
@@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 27
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 27
-EXTRAVERSION = -rc
1
+EXTRAVERSION = -rc
2
NAME = Rotary Wombat
# *DOCUMENTATION*
NAME = Rotary Wombat
# *DOCUMENTATION*
@@
-929,10
+929,10
@@
ifneq ($(KBUILD_SRC),)
echo " in the '$(srctree)' directory.";\
/bin/false; \
fi;
echo " in the '$(srctree)' directory.";\
/bin/false; \
fi;
- $(Q)if [ ! -d include2 ]; then
mkdir -p include2; fi;
-
$(Q)if [ -e $(srctree)/include/asm-$(SRCARCH)/errno.h ]; then
\
+ $(Q)if [ ! -d include2 ]; then
\
+
mkdir -p include2;
\
ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \
ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \
-
fi
+ fi
endif
# prepare2 creates a makefile if using a separate output directory
endif
# prepare2 creates a makefile if using a separate output directory
@@
-1492,7
+1492,7
@@
quiet_cmd_cscope-file = FILELST cscope.files
cmd_cscope-file = (echo \-k; echo \-q; $(all-sources)) > cscope.files
quiet_cmd_cscope = MAKE cscope.out
cmd_cscope-file = (echo \-k; echo \-q; $(all-sources)) > cscope.files
quiet_cmd_cscope = MAKE cscope.out
- cmd_cscope = cscope -b
+ cmd_cscope = cscope -b
-f cscope.out
cscope: FORCE
$(call cmd,cscope-file)
cscope: FORCE
$(call cmd,cscope-file)