diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-06 16:12:13 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-06 16:12:26 +0000 |
commit | 6b60805502fecc5ce05dad68fd242c4f3a1d1f1b (patch) | |
tree | a53537e00ede0a31b8f9f91c1d79d1e1a6670797 /arch/parisc/Makefile | |
parent | 4c75aab698d4b7cc08f3a5dd329fc7e9af3d0e3c (diff) | |
parent | af829310e8a914ad17ed61a7b18b14b4f457bca1 (diff) | |
download | blackbird-obmc-linux-6b60805502fecc5ce05dad68fd242c4f3a1d1f1b.tar.gz blackbird-obmc-linux-6b60805502fecc5ce05dad68fd242c4f3a1d1f1b.zip |
Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
* 'fixes' of git://github.com/hzhuang1/linux: (3 commits)
ARM: pxa: fix invalid mfp pin issue
ARM: pxa: remove duplicated registeration on pxa-gpio
ARM: pxa: add dummy clock for pxa25x and pxa27x
Includes an update to v3.3-rc6
Diffstat (limited to 'arch/parisc/Makefile')
-rw-r--r-- | arch/parisc/Makefile | 4 |
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 |