diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-17 18:21:41 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-17 18:21:41 +0200 |
| commit | 813400060fe2824163cabd9afed4e476e7ce282e (patch) | |
| tree | 22141d6e937991761345a63dd80125be13eb50ea /arch/x86/kernel/hpet.c | |
| parent | 1bf7b31efa0c322d93cb3f772cd9bc743e8bb42d (diff) | |
| parent | fe955e5c793aab398794be4c5ede172d48446c4a (diff) | |
Merge branch 'x86/urgent' into x86/mce3
Conflicts:
arch/x86/kernel/cpu/mcheck/mce_intel.c
Merge reason: merge with an urgent-branch MCE fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/hpet.c')
| -rw-r--r-- | arch/x86/kernel/hpet.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index 81408b93f88..dedc2bddf7a 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c @@ -510,7 +510,8 @@ static int hpet_setup_irq(struct hpet_dev *dev) { if (request_irq(dev->irq, hpet_interrupt_handler, - IRQF_DISABLED|IRQF_NOBALANCING, dev->name, dev)) + IRQF_TIMER | IRQF_DISABLED | IRQF_NOBALANCING, + dev->name, dev)) return -1; disable_irq(dev->irq); |