diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:43:52 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:43:52 -0500 |
commit | 99cd7074891f87c49660e3b2880564324a4733ac (patch) | |
tree | 903d2665bcb445f1f265d1adf7a99f265bcefc15 /Makefile | |
parent | e8a9cbf6ae620d9e5ba9cb42001c033287a284a3 (diff) | |
parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) |
Merge commit 'v2.6.29-rc1' into tracing/urgent
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1,7 +1,7 @@ | |||
1 | VERSION = 2 | 1 | VERSION = 2 |
2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
3 | SUBLEVEL = 28 | 3 | SUBLEVEL = 29 |
4 | EXTRAVERSION = | 4 | EXTRAVERSION = -rc1 |
5 | NAME = Erotic Pickled Herring | 5 | NAME = Erotic Pickled Herring |
6 | 6 | ||
7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
@@ -965,6 +965,7 @@ ifneq ($(KBUILD_SRC),) | |||
965 | mkdir -p include2; \ | 965 | mkdir -p include2; \ |
966 | ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \ | 966 | ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \ |
967 | fi | 967 | fi |
968 | ln -fsn $(srctree) source | ||
968 | endif | 969 | endif |
969 | 970 | ||
970 | # prepare2 creates a makefile if using a separate output directory | 971 | # prepare2 creates a makefile if using a separate output directory |
@@ -1008,7 +1009,7 @@ define check-symlink | |||
1008 | endef | 1009 | endef |
1009 | 1010 | ||
1010 | # We create the target directory of the symlink if it does | 1011 | # We create the target directory of the symlink if it does |
1011 | # not exist so the test in chack-symlink works and we have a | 1012 | # not exist so the test in check-symlink works and we have a |
1012 | # directory for generated filesas used by some architectures. | 1013 | # directory for generated filesas used by some architectures. |
1013 | define create-symlink | 1014 | define create-symlink |
1014 | if [ ! -L include/asm ]; then \ | 1015 | if [ ! -L include/asm ]; then \ |