diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2011-05-04 13:55:56 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2011-07-25 11:20:40 +1000 |
| commit | 10f939ff3ab80514da3bd96357bb54a8a59b9225 (patch) | |
| tree | 2e6bcabeccdb78d89523f478b723c4bc66cb8aef /arch/m68k/include/asm/hardirq_no.h | |
| parent | a66af29876b086d8279b48515b83ced66803fb15 (diff) | |
m68k: merge MMU and non-MMU versions of asm/hardirq.h
The contents of asm/hardirq.h are pretty strait forward for both the
MMU (hardirq_mm.h) and non-MMU (hardirq_no.h) include files. Merge the
two back into a single file.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/include/asm/hardirq_no.h')
| -rw-r--r-- | arch/m68k/include/asm/hardirq_no.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/m68k/include/asm/hardirq_no.h b/arch/m68k/include/asm/hardirq_no.h deleted file mode 100644 index b44b14be87d9..000000000000 --- a/arch/m68k/include/asm/hardirq_no.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef __M68K_HARDIRQ_H -#define __M68K_HARDIRQ_H - -#include <asm/irq.h> - -#define HARDIRQ_BITS 8 - -/* - * The hardirq mask has to be large enough to have - * space for potentially all IRQ sources in the system - * nesting on a single CPU: - */ -#if (1 << HARDIRQ_BITS) < NR_IRQS -# error HARDIRQ_BITS is too low! -#endif - -#include <asm-generic/hardirq.h> - -#endif /* __M68K_HARDIRQ_H */ |