git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-ep93xx
/
core.c
diff --git
a/arch/arm/mach-ep93xx/core.c
b/arch/arm/mach-ep93xx/core.c
index 6d9152de6074f1744965b2274d25a2ea02340bf5..ae24486f858a4a9d2e7482c67298c7e12c603b89 100644
(file)
--- a/
arch/arm/mach-ep93xx/core.c
+++ b/
arch/arm/mach-ep93xx/core.c
@@
-100,7
+100,7
@@
static unsigned int last_jiffy_time;
#define TIMER4_TICKS_PER_JIFFY ((CLOCK_TICK_RATE + (HZ/2)) / HZ)
-static i
n
t ep93xx_timer_interrupt(int irq, void *dev_id)
+static i
rqreturn_
t ep93xx_timer_interrupt(int irq, void *dev_id)
{
__raw_writel(1, EP93XX_TIMER1_CLEAR);
while ((signed long)