summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2012-10-30 16:24:27 +1000
committerGeert Uytterhoeven <geert@linux-m68k.org>2012-11-14 08:50:54 +0100
commit32782d51e95bb891695049033d0ba9ce0eefcd84 (patch)
treece39aba5a1269a7fb9e80a94e6f2827cfbb1dbe3 /arch
parent112f8b1294cc20163dc547399a0c4df5783cd89d (diff)
downloadop-kernel-dev-32782d51e95bb891695049033d0ba9ce0eefcd84.zip
op-kernel-dev-32782d51e95bb891695049033d0ba9ce0eefcd84.tar.gz
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 <gerg@uclinux.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/m68k/include/asm/Kbuild1
-rw-r--r--arch/m68k/include/asm/hw_irq.h6
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 88fa3ac..bf28713 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 eacef09..0000000
--- 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
OpenPOWER on IntegriCloud