aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/include/asm/hardirq_no.h
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2011-05-03 23:55:56 -0400
committerGreg Ungerer <gerg@uclinux.org>2011-07-24 21:20:40 -0400
commit10f939ff3ab80514da3bd96357bb54a8a59b9225 (patch)
tree2e6bcabeccdb78d89523f478b723c4bc66cb8aef /arch/m68k/include/asm/hardirq_no.h
parenta66af29876b086d8279b48515b83ced66803fb15 (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.h19
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 @@
1#ifndef __M68K_HARDIRQ_H
2#define __M68K_HARDIRQ_H
3
4#include <asm/irq.h>
5
6#define HARDIRQ_BITS 8
7
8/*
9 * The hardirq mask has to be large enough to have
10 * space for potentially all IRQ sources in the system
11 * nesting on a single CPU:
12 */
13#if (1 << HARDIRQ_BITS) < NR_IRQS
14# error HARDIRQ_BITS is too low!
15#endif
16
17#include <asm-generic/hardirq.h>
18
19#endif /* __M68K_HARDIRQ_H */