From 8958b5c693762287a3d1a2ae901b8fb32012736d Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Sat, 3 Jun 2006 22:30:58 +0100
Subject: [PATCH] --- yaml --- r: 31231 b: refs/heads/master c:
 b4ab24e1c8c1442b2928bab1325b56bdbbcf898e h: refs/heads/master i:   31229:
 4118d78323f97e48b907bbfa9957becdbbb7458e   31227:
 fa0a6e7b7a78571e939e532b9c4286089bcd88f7   31223:
 ec67d4e783a0c392c01f5a5eac244952a72c175c   31215:
 6e8a044246537af729751ec0533fe365afdaa74d   31199:
 02be9196bdc8c7216ed24394a23051d2f92a2b26   31167:
 702dce64c8024f295885f04936420416f4380cd6   31103:
 6dc0bab8094871392a9f88648355999d33cc45ed   30975:
 abd44fd7a7b5932d02fecdc412299905642d5779   30719:
 9991833e64508655770c042b36e7664ece7b545d v: v3

---
 [refs]                                 | 2 +-
 trunk/include/asm-mips/irq.h           | 4 ++++
 trunk/include/asm-mips/mach-mips/irq.h | 6 ------
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 690a4de7a958..3b0d1df4d677 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14cd8015015199d6e8dea8aa4948b559137df7b7
+refs/heads/master: b4ab24e1c8c1442b2928bab1325b56bdbbcf898e
diff --git a/trunk/include/asm-mips/irq.h b/trunk/include/asm-mips/irq.h
index d35c61776a02..896550bad322 100644
--- a/trunk/include/asm-mips/irq.h
+++ b/trunk/include/asm-mips/irq.h
@@ -76,4 +76,8 @@ extern int setup_irq_smtc(unsigned int irq, struct irqaction * new,
                           unsigned long hwmask);
 #endif /* CONFIG_MIPS_MT_SMTC */
 
+#ifdef CONFIG_SMP
+#define ARCH_HAS_IRQ_PER_CPU
+#endif
+
 #endif /* _ASM_IRQ_H */
diff --git a/trunk/include/asm-mips/mach-mips/irq.h b/trunk/include/asm-mips/mach-mips/irq.h
index 083d9c512a04..e994b0c01227 100644
--- a/trunk/include/asm-mips/mach-mips/irq.h
+++ b/trunk/include/asm-mips/mach-mips/irq.h
@@ -4,10 +4,4 @@
 
 #define NR_IRQS	256
 
-#ifdef CONFIG_SMP
-
-#define ARCH_HAS_IRQ_PER_CPU
-
-#endif
-
 #endif /* __ASM_MACH_MIPS_IRQ_H */