m68k: merge MMU and non-MMU versions of asm/hardirq.h
authorGreg Ungerer <gerg@uclinux.org>
Wed, 4 May 2011 03:55:56 +0000 (13:55 +1000)
committerGreg Ungerer <gerg@uclinux.org>
Mon, 25 Jul 2011 01:20:40 +0000 (11:20 +1000)
commit10f939ff3ab80514da3bd96357bb54a8a59b9225
tree2e6bcabeccdb78d89523f478b723c4bc66cb8aef
parenta66af29876b086d8279b48515b83ced66803fb15
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>
arch/m68k/include/asm/hardirq.h
arch/m68k/include/asm/hardirq_mm.h [deleted file]
arch/m68k/include/asm/hardirq_no.h [deleted file]
arch/m68k/include/asm/irq.h