diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-20 13:25:07 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-20 13:25:07 +1000 |
| commit | 3671628c7ef1d4a3732f1ba44bf8adac5c075403 (patch) | |
| tree | 23fb703a069d604caea7309f800f5938e9b37ff7 /arch/ia64 | |
| parent | 034b66239af0b9a4ab9defa6d8ea6380b134e4cf (diff) | |
| parent | fa7cd37f808c487f722d7a2ce9c0923a323922df (diff) | |
Merge remote branch 'lost-spurious-irq/lost-spurious-irq'
Conflicts:
drivers/ata/libata-core.c
include/linux/libata.h
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index ed6f22eb5b12..f9dfb57aba56 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c @@ -411,7 +411,7 @@ static cycle_t itc_get_cycles(struct clocksource *cs) static struct irqaction timer_irqaction = { .handler = timer_interrupt, - .flags = IRQF_DISABLED | IRQF_IRQPOLL, + .flags = IRQF_DISABLED, .name = "timer" }; |