aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sh/hw_irq.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-31 12:34:22 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-31 12:34:22 -0400
commit6679ce6e5f519096612b480d255d9ca97be0c2be (patch)
treecce6814d3e7c62adf59e565fb6ae95fd409f86ab /include/asm-sh/hw_irq.h
parent2c3d103ba90827cfb478bf10464d9b5b9cea369c (diff)
parent6e86841d05f371b5b9b86ce76c02aaee83352298 (diff)
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'include/asm-sh/hw_irq.h')
-rw-r--r--include/asm-sh/hw_irq.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sh/hw_irq.h b/include/asm-sh/hw_irq.h
index 7438d1e21bc9..d557b00111bf 100644
--- a/include/asm-sh/hw_irq.h
+++ b/include/asm-sh/hw_irq.h
@@ -79,7 +79,7 @@ struct intc_desc {
79 struct intc_sense_reg *sense_regs; 79 struct intc_sense_reg *sense_regs;
80 unsigned int nr_sense_regs; 80 unsigned int nr_sense_regs;
81 char *name; 81 char *name;
82#ifdef CONFIG_CPU_SH3 82#if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A)
83 struct intc_mask_reg *ack_regs; 83 struct intc_mask_reg *ack_regs;
84 unsigned int nr_ack_regs; 84 unsigned int nr_ack_regs;
85#endif 85#endif
@@ -95,7 +95,7 @@ struct intc_desc symbol __initdata = { \
95 chipname, \ 95 chipname, \
96} 96}
97 97
98#ifdef CONFIG_CPU_SH3 98#if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A)
99#define DECLARE_INTC_DESC_ACK(symbol, chipname, vectors, groups, \ 99#define DECLARE_INTC_DESC_ACK(symbol, chipname, vectors, groups, \
100 mask_regs, prio_regs, sense_regs, ack_regs) \ 100 mask_regs, prio_regs, sense_regs, ack_regs) \
101struct intc_desc symbol __initdata = { \ 101struct intc_desc symbol __initdata = { \