summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-03 16:33:51 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-03 16:33:51 -0800
commit233ba2c5ffcf83f3dee3f4451724273f76cb7d8b (patch)
tree559f7d1fdf647a03fc2b640168764e4a819d6576 /arch
parent001f3a48877a24afa7dfead84eb4678c68ab062e (diff)
parentaabb70dc23799e09d69d528756471d854f993136 (diff)
downloadlinux-233ba2c5ffcf83f3dee3f4451724273f76cb7d8b.tar.gz
linux-233ba2c5ffcf83f3dee3f4451724273f76cb7d8b.tar.bz2
linux-233ba2c5ffcf83f3dee3f4451724273f76cb7d8b.zip
Merge tag 'parisc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
PARISC fixes from James Bottomley: "This is a set of build fixes to get the cross compiled architecture testbeds building again" * tag 'parisc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6: [PARISC] don't unconditionally override CROSS_COMPILE for 64 bit. [PARISC] include <linux/prefetch.h> in drivers/parisc/iommu-helpers.h [PARISC] fix compile break caused by iomap: make IOPORT/PCI mapping functions conditional
Diffstat (limited to 'arch')
-rw-r--r--arch/parisc/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile
index 55cca1dac431..19ab7b2ea1cd 100644
--- a/arch/parisc/Makefile
+++ b/arch/parisc/Makefile
@@ -31,7 +31,11 @@ ifdef CONFIG_64BIT
UTS_MACHINE := parisc64
CHECKFLAGS += -D__LP64__=1 -m64
WIDTH := 64
+
+# FIXME: if no default set, should really try to locate dynamically
+ifeq ($(CROSS_COMPILE),)
CROSS_COMPILE := hppa64-linux-gnu-
+endif
else # 32-bit
WIDTH :=
endif