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 8637a82fde4dfc2566f55006fb4987dfa2c15ff3..9c86875157c79c56296d4774882c8ea183146e01 100644 (file)
--- 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