diff options
author | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
commit | 7f46b1343f723f98634a5dcee47856b2000079ed (patch) | |
tree | ed22b6298c8dd2f687890a0d79abcd1d273b5f81 /Makefile | |
parent | b8c31da64165b8566fc6e1c9c826f76e7b98ff02 (diff) | |
parent | 9e42d0cf5020aaf217433cad1a224745241d212a (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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 \ |