Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25:
  sh: Use relative paths for mach/cpu symlinks.
  SH: Use newer, non-deprecated __SPIN_LOCK_UNLOCKED macro.
  sh: Fix more user header breakage from sh64 integration.
  sh: Fix uImage build error.
  sh: Fix up the timer IRQ definition for SH7203.
  sh: Fix up the address error exception handler for SH-2.
  serial: sh-sci: Fix fifo stall on SH7760/SH7780/SH7785 SCIF.

1 files changed, 6 insertions, 2 deletions

diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index c510c225144f..cffc92b1bf2e 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -154,7 +154,11 @@ drivers-$(CONFIG_OPROFILE)	+= arch/sh/oprofile/
 
 boot := arch/sh/boot
 
+ifneq ($(KBUILD_SRC),)
 incdir-prefix   := $(srctree)/include/asm-sh/
+else
+incdir-prefix   :=
+endif
 
 #       Update machine arch and proc symlinks if something which affects
 #       them changed.  We use .arch and .mach to indicate when they were
@@ -182,7 +186,7 @@ include/asm-sh/.mach: $(wildcard include/config/sh/*.h) \
         $(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi
         $(Q)rm -f include/asm-sh/mach
         $(Q)for i in $(incdir-y); do \
-        if [ -d $(incdir-prefix)$$i ]; then \
+        if [ -d $(srctree)/include/asm-sh/$$i ]; then \
                 echo -n '  SYMLINK include/asm-sh/mach -> '; \
                 echo -e "include/asm-sh/$$i"; \
                 ln -fsn $(incdir-prefix)$$i \
@@ -191,7 +195,7 @@ include/asm-sh/.mach: $(wildcard include/config/sh/*.h) \
                 if [ ! -d include/asm-sh/mach ]; then \
                         echo -n '  SYMLINK include/asm-sh/mach -> '; \
                         echo -e 'include/asm-sh'; \
-                        ln -fsn $(incdir-prefix) include/asm-sh/mach; \
+                        ln -fsn $(incdir-prefix)../asm-sh include/asm-sh/mach; \
                 fi; \
         fi; \
         done