diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-02-15 13:36:30 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-02-15 13:36:30 -0500 |
| commit | 52833e897fd8c6f62b3e5e27291fa9bc803f7460 (patch) | |
| tree | cfe90047ee6c7402674a29ec7258319142b96ff1 /include/asm-sh/irq.h | |
| parent | 8d042218b075de3cdbe066198515b3521553746e (diff) | |
| parent | 4ee29f6a52158cea526b16a44ae38643946103ec (diff) | |
Merge branch 'linus_origin' into hotfixes
Diffstat (limited to 'include/asm-sh/irq.h')
| -rw-r--r-- | include/asm-sh/irq.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-sh/irq.h b/include/asm-sh/irq.h index 11850f65c922..ca66e5df69dc 100644 --- a/include/asm-sh/irq.h +++ b/include/asm-sh/irq.h | |||
| @@ -50,4 +50,8 @@ extern void irq_ctx_exit(int cpu); | |||
| 50 | # define irq_ctx_exit(cpu) do { } while (0) | 50 | # define irq_ctx_exit(cpu) do { } while (0) |
| 51 | #endif | 51 | #endif |
| 52 | 52 | ||
| 53 | #ifdef CONFIG_CPU_SH5 | ||
| 54 | #include <asm/cpu/irq.h> | ||
| 55 | #endif | ||
| 56 | |||
| 53 | #endif /* __ASM_SH_IRQ_H */ | 57 | #endif /* __ASM_SH_IRQ_H */ |