---

yaml --- r: 39148 b: refs/heads/master c: 6554207 h: refs/heads/master v: v3
git-mirror · Oct 8, 2006 · 1a99f97 · 1a99f97
1 parent 83ad80c
commit 1a99f97
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d864b96bb08f88d000cf8f78b5bac93fe631d0f5
+refs/heads/master: 65542070de7d6cd307657a71ab1712a6c58c0889
diff --git a/trunk/arch/mips/gt64120/common/time.c b/trunk/arch/mips/gt64120/common/time.c
@@ -20,7 +20,7 @@
  * differently than other MIPS interrupts.
  */
 
-static void gt64120_irq(int irq, void *dev_id)
+static irqreturn_t gt64120_irq(int irq, void *dev_id)
 {
 	unsigned int irq_src, int_high_src, irq_src_mask, int_high_src_mask;
 	int handled = 0;
@@ -43,6 +43,8 @@ static void gt64120_irq(int irq, void *dev_id)
 
 	GT_WRITE(GT_INTRCAUSE_OFS, 0);
 	GT_WRITE(GT_HINTRCAUSE_OFS, 0);
+
+	return IRQ_HANDLED;
 }
 
 /*