---

yaml --- r: 58858 b: refs/heads/master c: e745106 h: refs/heads/master v: v3
git-mirror · Jul 12, 2007 · 77a8ea0 · 77a8ea0
1 parent 5ca55d6
commit 77a8ea0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db0fa2064585a099e0c652983bd38d71ee7830f3
+refs/heads/master: e745106ce34553171a5d8d2450be07c0cffe39d5
diff --git a/trunk/include/asm-blackfin/mach-bf548/irq.h b/trunk/include/asm-blackfin/mach-bf548/irq.h
@@ -318,7 +318,6 @@ Events         (highest priority)  EMU         0
 #define IRQ_PI14	BFIN_PI_IRQ(14)
 #define IRQ_PI15	BFIN_PI_IRQ(15)
 
-#if 0
 #define BFIN_PJ_IRQ(x)	((x) + IRQ_PI15 + 1)
 #define IRQ_PJ0		BFIN_PJ_IRQ(0)
 #define IRQ_PJ1		BFIN_PJ_IRQ(1)
@@ -336,10 +335,9 @@ Events         (highest priority)  EMU         0
 #define IRQ_PJ13	BFIN_PJ_IRQ(13)
 #define IRQ_PJ14	BFIN_PJ_IRQ(14)		/* N/A */
 #define IRQ_PJ15	BFIN_PJ_IRQ(15)		/* N/A */
-#endif
 
 #ifdef CONFIG_IRQCHIP_DEMUX_GPIO
-#define NR_IRQS     (IRQ_PI15+1)
+#define NR_IRQS     (IRQ_PJ15+1)
 #else
 #define NR_IRQS     (SYS_IRQS+1)
 #endif