From ba2dacab305c598cd4c34a604f8e276bf5bab5ff Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 12 May 2000 21:05:59 +0000
Subject: Merge with Linux 2.3.99-pre7 and various other bits.

---
 include/asm-sparc/hardirq.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'include/asm-sparc/hardirq.h')

diff --git a/include/asm-sparc/hardirq.h b/include/asm-sparc/hardirq.h
index bbe134c28..c34312aa4 100644
--- a/include/asm-sparc/hardirq.h
+++ b/include/asm-sparc/hardirq.h
@@ -7,9 +7,10 @@
 #ifndef __SPARC_HARDIRQ_H
 #define __SPARC_HARDIRQ_H
 
+#include <linux/config.h>
 #include <linux/threads.h>
 
-#ifndef __SMP__
+#ifndef CONFIG_SMP
 extern unsigned int local_irq_count;
 
 /*
@@ -81,6 +82,6 @@ static inline int hardirq_trylock(int cpu)
 
 extern void synchronize_irq(void);
 
-#endif /* __SMP__ */
+#endif /* CONFIG_SMP */
 
 #endif /* __SPARC_HARDIRQ_H */
-- 
cgit v1.2.3