---

yaml --- r: 204540 b: refs/heads/master c: 9e6f396 h: refs/heads/master v: v3
git-mirror · Aug 5, 2010 · 2e9fd8f · 2e9fd8f
1 parent c457570
commit 2e9fd8f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eebacda40f2f9818c92f61b2228c7888e1f4926c
+refs/heads/master: 9e6f39698ac66e08017114a51600bf633becd011
diff --git a/trunk/arch/mips/emma/markeins/irq.c b/trunk/arch/mips/emma/markeins/irq.c
@@ -301,7 +301,7 @@ void __init arch_init_irq(void)
 	/* setup cascade interrupts */
 	setup_irq(EMMA2RH_IRQ_BASE + EMMA2RH_SW_CASCADE, &irq_cascade);
 	setup_irq(EMMA2RH_IRQ_BASE + EMMA2RH_GPIO_CASCADE, &irq_cascade);
-	setup_irq(MIPS_CPU_IRQ_BASE + CPU_EMMA2RH_CASCADE, &irq_cascade);
+	setup_irq(MIPS_CPU_IRQ_BASE + 2, &irq_cascade);
 }
 
 asmlinkage void plat_irq_dispatch(void)

diff --git a/trunk/arch/mips/include/asm/emma/emma2rh.h b/trunk/arch/mips/include/asm/emma/emma2rh.h
@@ -101,7 +101,6 @@
 
 #define NUM_EMMA2RH_IRQ		96
 
-#define CPU_EMMA2RH_CASCADE	2
 #define EMMA2RH_IRQ_BASE	(MIPS_CPU_IRQ_BASE + 8)
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -101,7 +101,6 @@ @@
     #define NUM_EMMA2RH_IRQ		96
-    #define CPU_EMMA2RH_CASCADE	2
     #define EMMA2RH_IRQ_BASE	(MIPS_CPU_IRQ_BASE + 8)
     /*
@@ Expand Down @@