Merge branch 'tmpreg' into devel

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-ux500/include/mach/debug-macro.S

diff --cc arch/arm/Kconfig
index b0c3c0d89e0590b5a384460b3a5d021fc6ce616f,4c33ca82f9b1f268bfdae70f0aee29fefaaf9cf7..7afc6150ac71eaf6f53eae32ba8952eff5b789b8
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -760,19 -763,27 +772,29 @@@ source "arch/arm/mach-ixp2000/Kconfig
  
  source "arch/arm/mach-ixp23xx/Kconfig"
  
+ source "arch/arm/mach-kirkwood/Kconfig"
+ 
+ source "arch/arm/mach-ks8695/Kconfig"
+ 
+ source "arch/arm/mach-lh7a40x/Kconfig"
+ 
  source "arch/arm/mach-loki/Kconfig"
  
+ source "arch/arm/mach-msm/Kconfig"
+ 
  source "arch/arm/mach-mv78xx0/Kconfig"
  
- source "arch/arm/mach-pxa/Kconfig"
- source "arch/arm/plat-pxa/Kconfig"
+ source "arch/arm/plat-mxc/Kconfig"
  
- source "arch/arm/mach-mmp/Kconfig"
+ source "arch/arm/mach-netx/Kconfig"
  
- source "arch/arm/mach-nuc93x/Kconfig"
+ source "arch/arm/mach-nomadik/Kconfig"
+ source "arch/arm/plat-nomadik/Kconfig"
  
- source "arch/arm/mach-sa1100/Kconfig"
+ source "arch/arm/mach-ns9xxx/Kconfig"
+ 
++source "arch/arm/mach-nuc93x/Kconfig"
 +
  source "arch/arm/plat-omap/Kconfig"
  
  source "arch/arm/mach-omap1/Kconfig"

diff --cc arch/arm/Makefile
index 3eaef160d4681431be434ab4f792b7361100d073,9e7582572741d7669b8bef7dddc271fdb9b12dd6..52a820d42776099a851ad686d1787f7a241d62f4
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -170,9 -171,7 +171,8 @@@ machine-$(CONFIG_ARCH_U300)                := u30
  machine-$(CONFIG_ARCH_U8500)          := ux500
  machine-$(CONFIG_ARCH_VERSATILE)      := versatile
  machine-$(CONFIG_ARCH_W90X900)                := w90x900
 +machine-$(CONFIG_ARCH_NUC93X)         := nuc93x
  machine-$(CONFIG_FOOTBRIDGE)          := footbridge
- machine-$(CONFIG_ARCH_MXC91231)               := mxc91231
  
  # Platform directory name.  This list is sorted alphanumerically
  # by CONFIG_* macro name.

diff --cc arch/arm/mach-ux500/include/mach/debug-macro.S
index 8de225e022356d651a261bf9f1debc9eec2e9a64,494408b9678501325e96d9c7db410c35a96efea6..09cbfda8aee5af8d6359fb25a0a525d99f11414f
--- 1/arch/arm/mach-ux500/include/mach/debug-macro.S
--- 2/arch/arm/mach-ux500/include/mach/debug-macro.S
+++ b/arch/arm/mach-ux500/include/mach/debug-macro.S
@@@ -8,13 -8,12 +8,13 @@@
   * published by the Free Software Foundation.
   *
   */
-       .macro  addruart,rx
 +#include <mach/hardware.h>
 +
+       .macro  addruart, rx, tmp
        mrc     p15, 0, \rx, c1, c0
 -      tst     \rx, #1                 @MMU enabled?
 -      moveq   \rx, #0x80000000        @MMU off, Physical address
 -      movne   \rx, #0xF0000000        @MMU on, Virtual address
 -      orr     \rx, \rx, #0x7000
 +      tst     \rx, #1                                 @ MMU enabled?
 +      ldreq   \rx, =U8500_UART2_BASE                  @ no, physical address
 +      ldrne   \rx, =IO_ADDRESS(U8500_UART2_BASE)      @ yes, virtual address
        .endm
  
  #include <asm/hardware/debug-pl01x.S>