shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 12:57:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
黄涛
2011-08-01 11:18:53 +08:00
parent d2747df30b
commit 0738036bde
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-rk29/include/mach/debug-macro.S
View File

@@ -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