diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-08-28 07:00:20 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-08-28 07:00:20 +0200 |
| commit | 4b61bb575b1fb42ab1df228ae7812e5135f656da (patch) | |
| tree | 03456466e6f678456ea462a7da4b352d1aa03aa3 /arch/x86/kernel/mfgpt_32.c | |
| parent | Input: xpad - add USB ID for the drumkit controller from Rock Band (diff) | |
| parent | Linux 2.6.31-rc8 (diff) | |
| download | linux-4b61bb575b1fb42ab1df228ae7812e5135f656da.tar.xz linux-4b61bb575b1fb42ab1df228ae7812e5135f656da.zip | |
Merge commit 'v2.6.31-rc8' into next
Diffstat (limited to 'arch/x86/kernel/mfgpt_32.c')
| -rw-r--r-- | arch/x86/kernel/mfgpt_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/mfgpt_32.c b/arch/x86/kernel/mfgpt_32.c index 846510b78a09..2a62d843f015 100644 --- 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" }; |