git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into locking-for-linus
[sfrench/cifs-2.6.git]
/
arch
/
mn10300
/
kernel
/
time.c
diff --git
a/arch/mn10300/kernel/time.c
b/arch/mn10300/kernel/time.c
index e4606586f94ce5e08d35720ca8b4f7512db4aa34..395caf01b9099cc42c2b2e3b0148765df3de0ed9 100644
(file)
--- a/
arch/mn10300/kernel/time.c
+++ b/
arch/mn10300/kernel/time.c
@@
-37,7
+37,6
@@
static irqreturn_t timer_interrupt(int irq, void *dev_id);
static struct irqaction timer_irq = {
.handler = timer_interrupt,
.flags = IRQF_DISABLED | IRQF_SHARED | IRQF_TIMER,
- .mask = CPU_MASK_NONE,
.name = "timer",
};