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, 3 insertions, 2 deletions

diff --git a/arch/powerpc/platforms/powermac/low_i2c.c b/arch/powerpc/platforms/powermac/low_i2c.c
index 06a137c5b8bb..480567e5fa9a 100644
--- a/arch/powerpc/platforms/powermac/low_i2c.c
+++ b/arch/powerpc/platforms/powermac/low_i2c.c
@@ -542,11 +542,12 @@ static struct pmac_i2c_host_kw *__init kw_i2c_host_init(struct device_node *np)
         /* Make sure IRQ is disabled */
         kw_write_reg(reg_ier, 0);
 
-        /* Request chip interrupt. We set IRQF_TIMER because we don't
+        /* Request chip interrupt. We set IRQF_NO_SUSPEND because we don't
          * want that interrupt disabled between the 2 passes of driver
          * suspend or we'll have issues running the pfuncs
          */
-        if (request_irq(host->irq, kw_i2c_irq, IRQF_TIMER, "keywest i2c", host))
+        if (request_irq(host->irq, kw_i2c_irq, IRQF_NO_SUSPEND,
+                        "keywest i2c", host))
                 host->irq = NO_IRQ;
 
         printk(KERN_INFO "KeyWest i2c @0x%08x irq %d %s\n",