From: Greg Ungerer Date: Tue, 30 Oct 2012 06:24:27 +0000 (+1000) Subject: m68k: switch to using the asm-generic hw_irq.h X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=32782d51e95bb891695049033d0ba9ce0eefcd84;p=deliverable%2Flinux.git m68k: switch to using the asm-generic hw_irq.h We don't need a local hw_irq.h, switch to using the asm-generic version. Signed-off-by: Greg Ungerer Signed-off-by: Geert Uytterhoeven --- diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild index 88fa3ac86fae..bf28713c2f15 100644 --- a/arch/m68k/include/asm/Kbuild +++ b/arch/m68k/include/asm/Kbuild @@ -7,6 +7,7 @@ generic-y += emergency-restart.h generic-y += errno.h generic-y += exec.h generic-y += futex.h +generic-y += hw_irq.h generic-y += ioctl.h generic-y += ipcbuf.h generic-y += irq_regs.h diff --git a/arch/m68k/include/asm/hw_irq.h b/arch/m68k/include/asm/hw_irq.h deleted file mode 100644 index eacef0951fbf..000000000000 --- a/arch/m68k/include/asm/hw_irq.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ASM_M68K_HW_IRQ_H -#define __ASM_M68K_HW_IRQ_H - -/* Dummy include. */ - -#endif