diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 22:07:25 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 22:07:25 +0000 |
commit | 186f93ea1f274f4cde4a356401c1786c818ff881 (patch) | |
tree | de28f076c823d5423a5b4780f0d37554c242c982 /arch/arm/mach-ep93xx/include | |
parent | 3560adf62075829393743667ff338dd8fd26a5c2 (diff) | |
parent | 4e6d488af37980d224cbf298224db6173673f362 (diff) | |
download | op-kernel-dev-186f93ea1f274f4cde4a356401c1786c818ff881.zip op-kernel-dev-186f93ea1f274f4cde4a356401c1786c818ff881.tar.gz |
Merge branch 'tmpreg' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/mach-ux500/include/mach/debug-macro.S
Diffstat (limited to 'arch/arm/mach-ep93xx/include')
-rw-r--r-- | arch/arm/mach-ep93xx/include/mach/debug-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ep93xx/include/mach/debug-macro.S b/arch/arm/mach-ep93xx/include/mach/debug-macro.S index 802858b..5cd2244 100644 --- a/arch/arm/mach-ep93xx/include/mach/debug-macro.S +++ b/arch/arm/mach-ep93xx/include/mach/debug-macro.S @@ -11,7 +11,7 @@ */ #include <mach/ep93xx-regs.h> - .macro addruart,rx + .macro addruart, rx, tmp mrc p15, 0, \rx, c1, c0 tst \rx, #1 @ MMU enabled? ldreq \rx, =EP93XX_APB_PHYS_BASE @ Physical base |