aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-06 16:25:43 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-06 16:25:43 -0400
commit17879857821adad4e180c5d6457c3b8bbf1d0c0c (patch)
tree28afa4b59847ca13b8d51a83fa04954916387de9 /arch/powerpc
parentb62ad9ab181a67207a4c8c373461b587c4861a68 (diff)
parent4877c737283813bdb4bebfa3168c1585f6e3a8ca (diff)
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
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/platforms/powermac/low_i2c.c5
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)
542 /* Make sure IRQ is disabled */ 542 /* Make sure IRQ is disabled */
543 kw_write_reg(reg_ier, 0); 543 kw_write_reg(reg_ier, 0);
544 544
545 /* Request chip interrupt. We set IRQF_TIMER because we don't 545 /* Request chip interrupt. We set IRQF_NO_SUSPEND because we don't
546 * want that interrupt disabled between the 2 passes of driver 546 * want that interrupt disabled between the 2 passes of driver
547 * suspend or we'll have issues running the pfuncs 547 * suspend or we'll have issues running the pfuncs
548 */ 548 */
549 if (request_irq(host->irq, kw_i2c_irq, IRQF_TIMER, "keywest i2c", host)) 549 if (request_irq(host->irq, kw_i2c_irq, IRQF_NO_SUSPEND,
550 "keywest i2c", host))
550 host->irq = NO_IRQ; 551 host->irq = NO_IRQ;
551 552
552 printk(KERN_INFO "KeyWest i2c @0x%08x irq %d %s\n", 553 printk(KERN_INFO "KeyWest i2c @0x%08x irq %d %s\n",