aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2011-08-18 20:13:20 +0100
committerRichard Weinberger <richard@nod.at>2011-11-02 14:15:31 +0100
commit8e66cda4af84321b308825f1c70aff6bffa30b35 (patch)
tree30df5b56de0c05dd1bf2505134e2fec2e58680e9
parentf5e900770f387d7a4c633b7cef105039f32a85c1 (diff)
downloadxhci-8e66cda4af84321b308825f1c70aff6bffa30b35.tar.gz
um: hw_irq.h can go generic as well
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at>
-rw-r--r--arch/um/include/asm/Kbuild2
-rw-r--r--arch/um/include/asm/hw_irq.h7
2 files changed, 1 insertions, 8 deletions
diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild
index e16895decf4ce4..5962826ac2050a 100644
--- a/arch/um/include/asm/Kbuild
+++ b/arch/um/include/asm/Kbuild
@@ -1,2 +1,2 @@
generic-y += bug.h cputime.h device.h emergency-restart.h futex.h hardirq.h
-generic-y += irq_regs.h kdebug.h percpu.h sections.h topology.h xor.h
+generic-y += hw_irq.h irq_regs.h kdebug.h percpu.h sections.h topology.h xor.h
diff --git a/arch/um/include/asm/hw_irq.h b/arch/um/include/asm/hw_irq.h
deleted file mode 100644
index 1cf84cf5f21af3..00000000000000
--- a/arch/um/include/asm/hw_irq.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASM_UM_HW_IRQ_H
-#define _ASM_UM_HW_IRQ_H
-
-#include "asm/irq.h"
-#include "asm/archparam.h"
-
-#endif