diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-26 09:23:57 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-26 09:23:57 +1100 |
| commit | 2a859ab07b6ab66f4134c4fffc341398bd3d328c (patch) | |
| tree | c5e7eaf3bffbc18feb326940e39794328d98dc07 /arch/mips/include/asm/delay.h | |
| parent | cedddd812a79a4fda3885a15711aee3de78c4a24 (diff) | |
| parent | e716e014384688d1a50d1aa5213ee74748c6d4e0 (diff) | |
| download | kernel_replicant_linux-2a859ab07b6ab66f4134c4fffc341398bd3d328c.tar.gz kernel_replicant_linux-2a859ab07b6ab66f4134c4fffc341398bd3d328c.tar.bz2 kernel_replicant_linux-2a859ab07b6ab66f4134c4fffc341398bd3d328c.zip | |
Merge branch 'merge' into next
Merge my own merge branch to get various fixes from there
and upstream, especially the hvc console tty refcouting fixes
which which testing is quite a bit harder...
Diffstat (limited to 'arch/mips/include/asm/delay.h')
| -rw-r--r-- | arch/mips/include/asm/delay.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/include/asm/delay.h b/arch/mips/include/asm/delay.h index e7cd78277c23..dc0a5f77a35c 100644 --- a/arch/mips/include/asm/delay.h +++ b/arch/mips/include/asm/delay.h @@ -13,9 +13,9 @@ #include <linux/param.h> -extern void __delay(unsigned int loops); -extern void __ndelay(unsigned int ns); -extern void __udelay(unsigned int us); +extern void __delay(unsigned long loops); +extern void __ndelay(unsigned long ns); +extern void __udelay(unsigned long us); #define ndelay(ns) __ndelay(ns) #define udelay(us) __udelay(us) |