From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 29 Apr 2014 00:23:11 +0000 (+0100)
Subject: Merge branches 'fixes' and 'misc' into for-next
X-Git-Tag: next-20140430~94^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c34eb07ff8977e6bf014d27cdf62aa4ca17494fa;p=karo-tx-linux.git

Merge branches 'fixes' and 'misc' into for-next
---

c34eb07ff8977e6bf014d27cdf62aa4ca17494fa
diff --cc arch/arm/kernel/iwmmxt.S
index 2452dd1bef53,4bb029ea8917..a5599cfc43cb
--- a/arch/arm/kernel/iwmmxt.S
+++ b/arch/arm/kernel/iwmmxt.S
@@@ -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)