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/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
arch
/
cris
/
arch-v32
/
kernel
/
time.c
diff --git
a/arch/cris/arch-v32/kernel/time.c
b/arch/cris/arch-v32/kernel/time.c
index
3a13dd6
..
65633d0
100644
(file)
--- a/
arch/cris/arch-v32/kernel/time.c
+++ b/
arch/cris/arch-v32/kernel/time.c
@@
-267,7
+267,6
@@
timer_interrupt(int irq, void *dev_id)
static struct irqaction irq_timer = {
.handler = timer_interrupt,
.flags = IRQF_SHARED | IRQF_DISABLED,
- .mask = CPU_MASK_NONE,
.name = "timer"
};