---

yaml --- r: 243335 b: refs/heads/master c: 8c99f56 h: refs/heads/master i: 243333: a12cdd6 243331: ec56a34 243327: 2b791a9 v: v3
git-mirror · Mar 29, 2011 · e99f283 · e99f283
1 parent e58735c
commit e99f283
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 212d786dabfee69c2ce5498821c2a0a679a1197b
+refs/heads/master: 8c99f561395f59ba9ec926c8940a4446fdfd8103
diff --git a/trunk/arch/powerpc/platforms/powermac/pic.c b/trunk/arch/powerpc/platforms/powermac/pic.c
@@ -157,7 +157,7 @@ static unsigned int pmac_startup_irq(struct irq_data *d)
         int i = src >> 5;
 
 	raw_spin_lock_irqsave(&pmac_pic_lock, flags);
-	if ((irq_to_desc(d->irq)->status & IRQ_LEVEL) == 0)
+	if (!irqd_is_level_type(d))
 		out_le32(&pmac_irq_hw[i]->ack, bit);
         __set_bit(src, ppc_cached_irq_mask);
         __pmac_set_irq_mask(src, 0);