---

yaml --- r: 243528 b: refs/heads/master c: 286b9bf h: refs/heads/master v: v3
git-mirror · Mar 29, 2011 · 679d60d · 679d60d
1 parent c5c3cf1
commit 679d60d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86cc8dfc211695193a060a240ac9c9287606e5d8
+refs/heads/master: 286b9bfe8ef6d97213c86bbaf30c250fd1f67568
diff --git a/trunk/drivers/sh/intc/internals.h b/trunk/drivers/sh/intc/internals.h
@@ -86,7 +86,7 @@ enum {	MODE_ENABLE_REG = 0, /* Bit(s) set -> interrupt enabled */
 
 static inline struct intc_desc_int *get_intc_desc(unsigned int irq)
 {
-	struct irq_chip *chip = get_irq_chip(irq);
+	struct irq_chip *chip = irq_get_chip(irq);
 
 	return container_of(chip, struct intc_desc_int, chip);
 }
@@ -103,7 +103,7 @@ static inline void activate_irq(int irq)
 	set_irq_flags(irq, IRQF_VALID);
 #else
 	/* same effect on other architectures */
-	set_irq_noprobe(irq);
+	irq_set_noprobe(irq);
 #endif
 }