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 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
arch
/
frv
/
kernel
/
time.c
diff --git
a/arch/frv/kernel/time.c
b/arch/frv/kernel/time.c
index
68a77fe
..
7e55884
100644
(file)
--- a/
arch/frv/kernel/time.c
+++ b/
arch/frv/kernel/time.c
@@
-26,7
+26,6
@@
#include <asm/timer-regs.h>
#include <asm/mb-regs.h>
#include <asm/mb86943a.h>
#include <asm/timer-regs.h>
#include <asm/mb-regs.h>
#include <asm/mb86943a.h>
-#include <asm/irq-routing.h>
#include <linux/timex.h>
#include <linux/timex.h>
@@
-71,7
+70,7
@@
static irqreturn_t timer_interrupt(int irq, void *dummy, struct pt_regs * regs)
*/
write_seqlock(&xtime_lock);
*/
write_seqlock(&xtime_lock);
- do_timer(
regs
);
+ do_timer(
1
);
update_process_times(user_mode(regs));
profile_tick(CPU_PROFILING, regs);
update_process_times(user_mode(regs));
profile_tick(CPU_PROFILING, regs);