projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'u-boot-arm/next' into 'u-boot-arm/master'
[platform/kernel/u-boot.git]
/
arch
/
arm
/
cpu
/
arm1176
/
bcm2835
/
mbox.c
diff --git
a/arch/arm/cpu/arm1176/bcm2835/mbox.c
b/arch/arm/cpu/arm1176/bcm2835/mbox.c
index
4daf1e4
..
3b17a31
100644
(file)
--- a/
arch/arm/cpu/arm1176/bcm2835/mbox.c
+++ b/
arch/arm/cpu/arm1176/bcm2835/mbox.c
@@
-8,7
+8,7
@@
#include <asm/io.h>
#include <asm/arch/mbox.h>
-#define TIMEOUT
(100 * 1000) /* 100mS in uS
*/
+#define TIMEOUT
1000 /* ms
*/
int bcm2835_mbox_call_raw(u32 chan, u32 send, u32 *recv)
{