diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /include/asm-sparc/hardirq.h | |
parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'include/asm-sparc/hardirq.h')
-rw-r--r-- | include/asm-sparc/hardirq.h | 5 |
1 files changed, 3 insertions, 2 deletions
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 */ |