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 'for-linus' of git://www.jni.nu/cris
[pandora-kernel.git]
/
arch
/
arm
/
lib
/
delay.S
diff --git
a/arch/arm/lib/delay.S
b/arch/arm/lib/delay.S
index
930a702
..
8d6a876
100644
(file)
--- a/
arch/arm/lib/delay.S
+++ b/
arch/arm/lib/delay.S
@@
-60,3
+60,6
@@
ENTRY(__delay)
#endif
bhi __delay
mov pc, lr
+ENDPROC(__udelay)
+ENDPROC(__const_udelay)
+ENDPROC(__delay)