diff options
Diffstat (limited to 'include/linux/sh_intc.h')
| -rw-r--r-- | include/linux/sh_intc.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/sh_intc.h b/include/linux/sh_intc.h index 68e212ff9dde..4ef246f14654 100644 --- a/include/linux/sh_intc.h +++ b/include/linux/sh_intc.h | |||
| @@ -57,10 +57,8 @@ struct intc_desc { | |||
| 57 | struct intc_sense_reg *sense_regs; | 57 | struct intc_sense_reg *sense_regs; |
| 58 | unsigned int nr_sense_regs; | 58 | unsigned int nr_sense_regs; |
| 59 | char *name; | 59 | char *name; |
| 60 | #if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A) | ||
| 61 | struct intc_mask_reg *ack_regs; | 60 | struct intc_mask_reg *ack_regs; |
| 62 | unsigned int nr_ack_regs; | 61 | unsigned int nr_ack_regs; |
| 63 | #endif | ||
| 64 | }; | 62 | }; |
| 65 | 63 | ||
| 66 | #define _INTC_ARRAY(a) a, sizeof(a)/sizeof(*a) | 64 | #define _INTC_ARRAY(a) a, sizeof(a)/sizeof(*a) |
| @@ -73,7 +71,6 @@ struct intc_desc symbol __initdata = { \ | |||
| 73 | chipname, \ | 71 | chipname, \ |
| 74 | } | 72 | } |
| 75 | 73 | ||
| 76 | #if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A) | ||
| 77 | #define DECLARE_INTC_DESC_ACK(symbol, chipname, vectors, groups, \ | 74 | #define DECLARE_INTC_DESC_ACK(symbol, chipname, vectors, groups, \ |
| 78 | mask_regs, prio_regs, sense_regs, ack_regs) \ | 75 | mask_regs, prio_regs, sense_regs, ack_regs) \ |
| 79 | struct intc_desc symbol __initdata = { \ | 76 | struct intc_desc symbol __initdata = { \ |
| @@ -83,9 +80,11 @@ struct intc_desc symbol __initdata = { \ | |||
| 83 | chipname, \ | 80 | chipname, \ |
| 84 | _INTC_ARRAY(ack_regs), \ | 81 | _INTC_ARRAY(ack_regs), \ |
| 85 | } | 82 | } |
| 86 | #endif | ||
| 87 | 83 | ||
| 88 | void __init register_intc_controller(struct intc_desc *desc); | 84 | void __init register_intc_controller(struct intc_desc *desc); |
| 89 | int intc_set_priority(unsigned int irq, unsigned int prio); | 85 | int intc_set_priority(unsigned int irq, unsigned int prio); |
| 90 | 86 | ||
| 87 | int reserve_irq_vector(unsigned int irq); | ||
| 88 | void reserve_irq_legacy(void); | ||
| 89 | |||
| 91 | #endif /* __SH_INTC_H */ | 90 | #endif /* __SH_INTC_H */ |
