X-Git-Url: http://bbs.cooldavid.org/git/?a=blobdiff_plain;f=arch%2Farm%2Fmach-ns9xxx%2Finclude%2Fmach%2Fdebug-macro.S;h=5a2acbdc3d679f2563aab0a8a24b4988b26431aa;hb=0ea1293009826da45e1019f45dfde1e557bb30df;hp=5c934bdb71583e037c59fdadc3490e43838ff425;hpb=c939f9f9d225972a60181c95df8a9aa50f8b1701;p=net-next-2.6.git

diff --git a/arch/arm/mach-ns9xxx/include/mach/debug-macro.S b/arch/arm/mach-ns9xxx/include/mach/debug-macro.S
index 5c934bdb715..5a2acbdc3d6 100644
--- a/arch/arm/mach-ns9xxx/include/mach/debug-macro.S
+++ b/arch/arm/mach-ns9xxx/include/mach/debug-macro.S
@@ -12,11 +12,9 @@
 
 #include <mach/regs-board-a9m9750dev.h>
 
-		.macro	addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1
-		ldreq	\rx, =NS9XXX_CSxSTAT_PHYS(0)
-		ldrne	\rx, =io_p2v(NS9XXX_CSxSTAT_PHYS(0))
+		.macro	addruart, rp, rv
+		ldr	\rp, =NS9XXX_CSxSTAT_PHYS(0)
+		ldr	\rv, =io_p2v(NS9XXX_CSxSTAT_PHYS(0))
 		.endm
 
 #define UART_SHIFT	2