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 'irqclean-submit1' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzi...
[pandora-kernel.git]
/
arch
/
um
/
kernel
/
time.c
diff --git
a/arch/um/kernel/time.c
b/arch/um/kernel/time.c
index
a92965f
..
2e354b3
100644
(file)
--- a/
arch/um/kernel/time.c
+++ b/
arch/um/kernel/time.c
@@
-86,7
+86,7
@@
static inline unsigned long long get_time(void)
return nsecs;
}
return nsecs;
}
-irqreturn_t um_timer(int irq, void *dev
, struct pt_regs *regs
)
+irqreturn_t um_timer(int irq, void *dev)
{
unsigned long long nsecs;
unsigned long flags;
{
unsigned long long nsecs;
unsigned long flags;