diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 09:19:22 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 09:19:22 -0400 |
| commit | f13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0 (patch) | |
| tree | 44419bd03c33e662302dd003f57d36e133144f91 /arch/arm/mach-shark/include/mach | |
| parent | e910b63d009701ad4ebbeb089aba35707fa5d68e (diff) | |
| parent | 5da3e714e30d40145f4dd37d79de6bbbcb9e6137 (diff) | |
Merge branch 'shmobile' into devel
Diffstat (limited to 'arch/arm/mach-shark/include/mach')
| -rw-r--r-- | arch/arm/mach-shark/include/mach/debug-macro.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-shark/include/mach/debug-macro.S b/arch/arm/mach-shark/include/mach/debug-macro.S index 50f071c5bf4d..5ea24d4d1ba6 100644 --- a/arch/arm/mach-shark/include/mach/debug-macro.S +++ b/arch/arm/mach-shark/include/mach/debug-macro.S | |||
| @@ -20,6 +20,9 @@ | |||
| 20 | strb \rd, [\rx] | 20 | strb \rd, [\rx] |
| 21 | .endm | 21 | .endm |
| 22 | 22 | ||
| 23 | .macro waituart,rd,rx | ||
| 24 | .endm | ||
| 25 | |||
| 23 | .macro busyuart,rd,rx | 26 | .macro busyuart,rd,rx |
| 24 | mov \rd, #0 | 27 | mov \rd, #0 |
| 25 | 1001: add \rd, \rd, #1 | 28 | 1001: add \rd, \rd, #1 |