From: 黄涛 <huangtao@rock-chips.com>
Date: Mon, 1 Aug 2011 03:18:53 +0000 (+0800)
Subject: rk29: debug-macro.S: fix for v2.6.36
X-Git-Tag: firefly_0821_release~9813
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0738036bdef184afb1fa72020f770baa94f278eb;p=firefly-linux-kernel-4.4.55.git

rk29: debug-macro.S: fix for v2.6.36
---

diff --git a/arch/arm/mach-rk29/include/mach/debug-macro.S b/arch/arm/mach-rk29/include/mach/debug-macro.S
index 8637a82fde4d..9c86875157c7 100644
--- a/arch/arm/mach-rk29/include/mach/debug-macro.S
+++ b/arch/arm/mach-rk29/include/mach/debug-macro.S
@@ -15,6 +15,7 @@
 
 /* pull in the relevant register and map files. */
 
+#include <linux/version.h>
 #include <mach/rk29_iomap.h>
 
 	/* note, for the boot process to work we have to keep the UART
@@ -23,7 +24,11 @@
 	 * aligned and add in the offset when we load the value here.
 	 */
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34))
+	.macro addruart, rx, tmp
+#else
 	.macro addruart, rx
+#endif
 		mrc	p15, 0, \rx, c1, c0
 		tst	\rx, #1
 		ldreq	\rx, = RK29_UART1_PHYS