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 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs
[pandora-kernel.git]
/
arch
/
frv
/
kernel
/
time.c
diff --git
a/arch/frv/kernel/time.c
b/arch/frv/kernel/time.c
index
69f6a4e
..
fb0ce75
100644
(file)
--- a/
arch/frv/kernel/time.c
+++ b/
arch/frv/kernel/time.c
@@
-45,7
+45,6
@@
static irqreturn_t timer_interrupt(int irq, void *dummy);
static struct irqaction timer_irq = {
.handler = timer_interrupt,
.flags = IRQF_DISABLED,
- .mask = CPU_MASK_NONE,
.name = "timer",
};