aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-29 08:03:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-29 08:03:48 -0700
commitc07724e5b868c603f2a65f3855c77b23454db3ed (patch)
tree658b1f0af5966e418f48a53e8b2f97e10b250f4f /Makefile
parent302f5bc54448bd2b37d5a8be9b6abc29397827ef (diff)
parente69f58c037ab5b166b3858fa7b5d7fa470613e8f (diff)
downloadlinux-linaro-android-c07724e5b868c603f2a65f3855c77b23454db3ed.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: kbuild: add ARCH=sparc32 target sparc32: fix build failure on CONFIG_SPARC_LEON sparc: Fixed random SPARC/LEON SMP CPU Stuck problem. sparc32: remove CONFIG_HAVE_PERF_EVENTS option sparc: don't #include asm/system.h in asm/jump_label.h sparc32: Fix unaligned stack handling on trap return. sparc: keep calling do_signal() as long as pending signals remain
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 6b23f1b15fc..519db43052a 100644
--- a/Makefile
+++ b/Makefile
@@ -204,6 +204,9 @@ ifeq ($(ARCH),x86_64)
endif
# Additional ARCH settings for sparc
+ifeq ($(ARCH),sparc32)
+ SRCARCH := sparc
+endif
ifeq ($(ARCH),sparc64)
SRCARCH := sparc
endif