Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Conflicts:
	drivers/mtd/mtd_blkdevs.c

Merge Grant's device-tree bits so that we can apply the subsequent fixes.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/arch/arm/mach-u300/include/mach/debug-macro.S b/arch/arm/mach-u300/include/mach/debug-macro.S
index 92c12420256f..df715707bead 100644
--- a/arch/arm/mach-u300/include/mach/debug-macro.S
+++ b/arch/arm/mach-u300/include/mach/debug-macro.S
@@ -10,13 +10,12 @@
  */
 #include <mach/hardware.h>
 
-        .macro  addruart, rx, tmp
+        .macro  addruart, rp, rv
         /* If we move the address using MMU, use this. */
-        mrc     p15, 0, \rx, c1, c0
-        tst     \rx, #1                 @ MMU enabled?
-        ldreq   \rx,      = U300_SLOW_PER_PHYS_BASE @ MMU off, physical address
-        ldrne   \rx,      = U300_SLOW_PER_VIRT_BASE @ MMU on, virtual address
-        orr     \rx, \rx, #0x00003000
+        ldr     \rp,      = U300_SLOW_PER_PHYS_BASE @ MMU off, physical address
+        ldr     \rv,      = U300_SLOW_PER_VIRT_BASE @ MMU on, virtual address
+        orr     \rp, \rp, #0x00003000
+        orr     \rv, \rv, #0x00003000
         .endm
 
 #include <asm/hardware/debug-pl01x.S>