---

yaml --- r: 275379 b: refs/heads/master c: 13d6da3 h: refs/heads/master i: 275377: 8cfebf4 275375: 0b3fa24 v: v3
git-mirror · Nov 8, 2011 · c7d9c72 · c7d9c72
1 parent c994833
commit c7d9c72
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: e8abf5e73cdb6c034d35ccba1f63a4801cd3dec5
+refs/heads/master: 13d6da35813babaa1bc8c6799b2666191911100e
diff --git a/trunk/arch/m68k/kernel/ints.c b/trunk/arch/m68k/kernel/ints.c
@@ -176,7 +176,7 @@ struct irq_data *new_irq_node(void)
 	return NULL;
 }
 
-int setup_irq(unsigned int irq, struct irq_data *node)
+static int m68k_setup_irq(unsigned int irq, struct irq_data *node)
 {
 	struct irq_chip *contr;
 	struct irq_data **prev;
@@ -232,7 +232,7 @@ int request_irq(unsigned int irq,
 	node->dev_id  = dev_id;
 	node->devname = devname;
 
-	res = setup_irq(irq, node);
+	res = m68k_setup_irq(irq, node);
 	if (res)
 		node->handler = NULL;