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 'topic/pcm-estrpipe-in-pm' into for-linus
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
mfgpt_32.c
diff --git
a/arch/x86/kernel/mfgpt_32.c
b/arch/x86/kernel/mfgpt_32.c
index
846510b
..
2a62d84
100644
(file)
--- a/
arch/x86/kernel/mfgpt_32.c
+++ b/
arch/x86/kernel/mfgpt_32.c
@@
-347,7
+347,7
@@
static irqreturn_t mfgpt_tick(int irq, void *dev_id)
static struct irqaction mfgptirq = {
.handler = mfgpt_tick,
- .flags = IRQF_DISABLED | IRQF_NOBALANCING,
+ .flags = IRQF_DISABLED | IRQF_NOBALANCING
| IRQF_TIMER
,
.name = "mfgpt-timer"
};