diff options
author | Sebastian Reichel <sre@kernel.org> | 2014-05-06 15:44:50 +0200 |
---|---|---|
committer | Sebastian Reichel <sre@kernel.org> | 2014-05-06 15:44:50 +0200 |
commit | 695f5ec02203ef23f127eacb86991d23307f3c6f (patch) | |
tree | ecb9c29268fa34559dfa06472d991bc5d92708be /arch/arm/kernel/iwmmxt.S | |
parent | 5bdeae302496a8ac49848f4fed26b1d87a67d966 (diff) | |
parent | 793ec5f7dccf95c0d6d5d57a925a13261a7cbd2b (diff) | |
download | linux-n900-dt-with-ssi.tar.bz2 |
Merge branch 'n900-modem-support' into n900-dt-with-ssin900-dt-with-ssi
Conflicts:
arch/arm/boot/dts/omap3-n900.dts
Diffstat (limited to 'arch/arm/kernel/iwmmxt.S')
-rw-r--r-- | arch/arm/kernel/iwmmxt.S | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/kernel/iwmmxt.S b/arch/arm/kernel/iwmmxt.S index a08783823b32..2452dd1bef53 100644 --- a/arch/arm/kernel/iwmmxt.S +++ b/arch/arm/kernel/iwmmxt.S @@ -19,12 +19,16 @@ #include <asm/thread_info.h> #include <asm/asm-offsets.h> -#if defined(CONFIG_CPU_PJ4) +#if defined(CONFIG_CPU_PJ4) || defined(CONFIG_CPU_PJ4B) #define PJ4(code...) code #define XSC(code...) -#else +#elif defined(CONFIG_CPU_MOHAWK) || \ + defined(CONFIG_CPU_XSC3) || \ + defined(CONFIG_CPU_XSCALE) #define PJ4(code...) #define XSC(code...) code +#else +#error "Unsupported iWMMXt architecture" #endif #define MMX_WR0 (0x00) |