Kill irq_cannonicalize.

1 files changed, 14 insertions, 5 deletions

diff --git a/include/asm-mips64/irq.h b/include/asm-mips64/irq.h
index 031955635..719667e0f 100644
--- a/include/asm-mips64/irq.h
+++ b/include/asm-mips64/irq.h
@@ -1,21 +1,30 @@
-/* $Id$
- *
+/*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
  * Copyright (C) 1994 by Waldorf GMBH, written by Ralf Baechle
- * Copyright (C) 1995 - 1999 by Ralf Baechle
- * Copyright (C) 1999 Silicon Graphics, Inc.
+ * Copyright (C) 1995, 96, 97, 98, 1999, 2000 by Ralf Baechle
+ * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
  */
 #ifndef _ASM_IRQ_H
 #define _ASM_IRQ_H
 
+#include <linux/config.h>
+
 #define NR_IRQS 256
 
 #define TIMER_IRQ 0
 
-extern int (*irq_cannonicalize)(int irq);
+#ifdef CONFIG_I8259
+static inline int irq_cannonicalize(int irq)
+{
+	return ((irq == 2) ? 9 : irq);
+}
+#else
+#define irq_cannonicalize(irq) (irq)	/* Sane hardware, sane code ... */
+#endif
+
 
 struct irqaction;
 extern int i8259_setup_irq(int irq, struct irqaction * new);