From 0738036bdef184afb1fa72020f770baa94f278eb Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Mon, 1 Aug 2011 11:18:53 +0800 Subject: [PATCH] rk29: debug-macro.S: fix for v2.6.36 --- arch/arm/mach-rk29/include/mach/debug-macro.S | 5 +++++ 1 file changed, 5 insertions(+) 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 #include /* 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 -- 2.34.1