From ad4dc5dcb998def718a2b25ee16e93e57bfead80 Mon Sep 17 00:00:00 2001
From: Bernhard Walle <bwalle@suse.de>
Date: Tue, 8 May 2007 00:35:36 -0700
Subject: [PATCH] --- yaml --- r: 54823 b: refs/heads/master c:
 57501c70747fd6d7b14f7863126e5a75d29613b1 h: refs/heads/master i:   54821:
 ca14a95cb3ff1eb271500a846cc17b27833af22b   54819:
 1e4926d421b68bf6c0cf5fd65357f97dc60bedaf   54815:
 1340df05aa8e23e4fc162f9010c32567f66b385f v: v3

---
 [refs]                         | 2 +-
 trunk/arch/parisc/kernel/irq.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index aa2163472f4c..6f8bea05f614 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9485baed07561e516690671343622e5fcd73b48
+refs/heads/master: 57501c70747fd6d7b14f7863126e5a75d29613b1
diff --git a/trunk/arch/parisc/kernel/irq.c b/trunk/arch/parisc/kernel/irq.c
index e9d09b020e86..c5c9125dacec 100644
--- a/trunk/arch/parisc/kernel/irq.c
+++ b/trunk/arch/parisc/kernel/irq.c
@@ -388,7 +388,7 @@ void do_cpu_irq_mask(struct pt_regs *regs)
 static struct irqaction timer_action = {
 	.handler = timer_interrupt,
 	.name = "timer",
-	.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_PERCPU,
+	.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_PERCPU | IRQF_IRQPOLL,
 };
 
 #ifdef CONFIG_SMP