From 126bc38a5ee21f97ddfe0bfae70bd0b6c71dec2f Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 4 Oct 2010 13:47:12 +0200
Subject: [PATCH] --- yaml --- r: 212159 b: refs/heads/master c:
 3a3856d00c74560a7b8d9f8a13c1ca94ee786b78 h: refs/heads/master i:   212157:
 68c0044ce5ba69970a1aa5b9a3da433038041c4b   212155:
 1a752644dc3e2cd8b7d58ea3c053c4182c2a81e6   212151:
 94056ac3c2f2ba825d54c1b348a926ba1d507901   212143:
 569a1ea45a06107368a5d663fbdd2f02ddf7cd77   212127:
 97853a83732285def4f4dc1d707a8ff5ae928c10   212095:
 2f8535c2e1b125f3f1fe12c3cb0a9ec9181a84c8 v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/irq.h | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index d1b05d3998ab..5313e54102c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e144710b302525de5b90b9c3ba43562458d8957f
+refs/heads/master: 3a3856d00c74560a7b8d9f8a13c1ca94ee786b78
diff --git a/trunk/include/linux/irq.h b/trunk/include/linux/irq.h
index f5827abbc034..80fdab208c13 100644
--- a/trunk/include/linux/irq.h
+++ b/trunk/include/linux/irq.h
@@ -215,15 +215,9 @@ extern void remove_irq(unsigned int irq, struct irqaction *act);
 
 #ifdef CONFIG_GENERIC_HARDIRQS
 
-#ifdef CONFIG_SMP
-# ifdef CONFIG_GENERIC_PENDING_IRQ
+#if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_PENDING_IRQ)
 void move_native_irq(int irq);
 void move_masked_irq(int irq);
-# else
-static inline void move_irq(int irq) { }
-static inline void move_native_irq(int irq) { }
-static inline void move_masked_irq(int irq) { }
-# endif
 #else
 static inline void move_native_irq(int irq) { }
 static inline void move_masked_irq(int irq) { }