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 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst...
[pandora-kernel.git]
/
arch
/
arm
/
mach-ixp2000
/
core.c
diff --git
a/arch/arm/mach-ixp2000/core.c
b/arch/arm/mach-ixp2000/core.c
index
babb225
..
e24e3d0
100644
(file)
--- a/
arch/arm/mach-ixp2000/core.c
+++ b/
arch/arm/mach-ixp2000/core.c
@@
-197,7
+197,7
@@
unsigned long ixp2000_gettimeoffset (void)
return offset / ticks_per_usec;
}
return offset / ticks_per_usec;
}
-static i
n
t ixp2000_timer_interrupt(int irq, void *dev_id)
+static i
rqreturn_
t ixp2000_timer_interrupt(int irq, void *dev_id)
{
/* clear timer 1 */
ixp2000_reg_wrb(IXP2000_T1_CLR, 1);
{
/* clear timer 1 */
ixp2000_reg_wrb(IXP2000_T1_CLR, 1);