git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-shark
/
include
/
mach
/
debug-macro.S
diff --git
a/arch/arm/mach-shark/include/mach/debug-macro.S
b/arch/arm/mach-shark/include/mach/debug-macro.S
index
0836cb7
..
f97a762
100644
(file)
--- a/
arch/arm/mach-shark/include/mach/debug-macro.S
+++ b/
arch/arm/mach-shark/include/mach/debug-macro.S
@@
-27,5
+27,3
@@
bne 1001b
.endm
- .macro waituart,rd,rx
- .endm