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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
arch
/
h8300
/
kernel
/
timer
/
timer16.c
diff --git
a/arch/h8300/kernel/timer/timer16.c
b/arch/h8300/kernel/timer/timer16.c
index
e14271b
..
042dbb5
100644
(file)
--- a/
arch/h8300/kernel/timer/timer16.c
+++ b/
arch/h8300/kernel/timer/timer16.c
@@
-55,7
+55,6
@@
static struct irqaction timer16_irq = {
.name = "timer-16",
.handler = timer_interrupt,
.flags = IRQF_DISABLED | IRQF_TIMER,
.name = "timer-16",
.handler = timer_interrupt,
.flags = IRQF_DISABLED | IRQF_TIMER,
- .mask = CPU_MASK_NONE,
};
static const int __initdata divide_rate[] = {1, 2, 4, 8};
};
static const int __initdata divide_rate[] = {1, 2, 4, 8};