From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 25 May 2014 22:50:14 +0000 (+0100)
Subject: Merge branches 'alignment', 'fixes', 'l2c' (early part) and 'misc' into for-next
X-Git-Tag: next-20140530~121^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a589ca2058b62d399548da8325210d1c94a2a1a8;p=karo-tx-linux.git

Merge branches 'alignment', 'fixes', 'l2c' (early part) and 'misc' into for-next
---

a589ca2058b62d399548da8325210d1c94a2a1a8
diff --cc arch/arm/kernel/iwmmxt.S
index 2452dd1bef53,2452dd1bef53,2452dd1bef53,4bb029ea8917..a5599cfc43cb
--- a/arch/arm/kernel/iwmmxt.S
+++ b/arch/arm/kernel/iwmmxt.S
@@@@@ -18,17 -18,17 -18,17 -18,14 +18,18 @@@@@
    #include <asm/ptrace.h>
    #include <asm/thread_info.h>
    #include <asm/asm-offsets.h>
+++ #include <asm/assembler.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)