summaryrefslogtreecommitdiffstats
path: root/arch/sh/include/asm/irq.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-06-14 16:21:54 +0200
committerPaul Mundt <lethal@linux-sh.org>2009-06-14 16:21:54 +0200
commitf8f06bc74b5afbb434b8f3982db19acdbf48dee9 (patch)
tree69599c78e1394f2a4f1ec6990b4f8515a88fe254 /arch/sh/include/asm/irq.h
parentsh: Convert ipc/shm bits to their asm-generic versions. (diff)
downloadlinux-f8f06bc74b5afbb434b8f3982db19acdbf48dee9.tar.xz
linux-f8f06bc74b5afbb434b8f3982db19acdbf48dee9.zip
sh: Tidy up duplication in irq/swab/timex.h.
The asm-generic versions have some helper definitions that we can use instead, drop our definitions and use those instead. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include/asm/irq.h')
-rw-r--r--arch/sh/include/asm/irq.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/asm/irq.h b/arch/sh/include/asm/irq.h
index a2b8c99cc06f..df8e1500527c 100644
--- a/arch/sh/include/asm/irq.h
+++ b/arch/sh/include/asm/irq.h
@@ -39,7 +39,6 @@ static inline int generic_irq_demux(int irq)
return irq;
}
-#define irq_canonicalize(irq) (irq)
#define irq_demux(irq) sh_mv.mv_irq_demux(irq)
void init_IRQ(void);
@@ -54,6 +53,7 @@ extern void irq_ctx_exit(int cpu);
# define irq_ctx_exit(cpu) do { } while (0)
#endif
+#include <asm-generic/irq.h>
#ifdef CONFIG_CPU_SH5
#include <cpu/irq.h>
#endif