Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  xen: Do not suspend IPI IRQs.
  powerpc: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupts
  ixp4xx-beeper: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupt
  irq: Add new IRQ flag IRQF_NO_SUSPEND

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 3d4fc0f7b00b..35bc2737412f 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -400,11 +400,12 @@ static int __init via_pmu_start(void)
                 printk(KERN_ERR "via-pmu: can't map interrupt\n");
                 return -ENODEV;
         }
-        /* We set IRQF_TIMER because we don't want the interrupt to be disabled
-         * between the 2 passes of driver suspend, we control our own disabling
-         * for that one
+        /* We set IRQF_NO_SUSPEND because we don't want the interrupt
+         * to be disabled between the 2 passes of driver suspend, we
+         * control our own disabling for that one
          */
-        if (request_irq(irq, via_pmu_interrupt, IRQF_TIMER, "VIA-PMU", (void *)0)) {
+        if (request_irq(irq, via_pmu_interrupt, IRQF_NO_SUSPEND,
+                        "VIA-PMU", (void *)0)) {
                 printk(KERN_ERR "via-pmu: can't request irq %d\n", irq);
                 return -ENODEV;
         }