xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'tmpreg' into devel

Browse Source 
Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-ux500/include/mach/debug-macro.S
This commit is contained in:
Russell King
2010-02-25 22:07:25 +00:00
parent 3560adf620 4e6d488af3
commit 186f93ea1f
54 changed files with 146 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-ux500/include/mach/debug-macro.S
View File

@@ -10,7 +10,7 @@
*/
#include <mach/hardware.h>
.macro addruart,rx
.macro addruart, rx, tmp
mrc p15, 0, \rx, c1, c0
tst \rx, #1 @ MMU enabled?
ldreq \rx, =U8500_UART2_BASE @ no, physical address