diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 11:55:32 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 11:55:32 +1100 |
| commit | 0ffe1512a44f63d488efa5f79d5642af1410d5d0 (patch) | |
| tree | c5f98d46b6dfcd718d372eff9a1c6de6e4558bef /include | |
| parent | 1bb976266059951f5b7c826455ba2496ed98b91e (diff) | |
| parent | edad1f208e6edabb917e4f8a33c7e45bf78bb79d (diff) | |
Merge remote branch 'sh/master'
Diffstat (limited to 'include')
| -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 { struct intc_sense_reg *sense_regs; unsigned int nr_sense_regs; char *name; -#if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A) struct intc_mask_reg *ack_regs; unsigned int nr_ack_regs; -#endif }; #define _INTC_ARRAY(a) a, sizeof(a)/sizeof(*a) @@ -73,7 +71,6 @@ struct intc_desc symbol __initdata = { \ chipname, \ } -#if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A) #define DECLARE_INTC_DESC_ACK(symbol, chipname, vectors, groups, \ mask_regs, prio_regs, sense_regs, ack_regs) \ struct intc_desc symbol __initdata = { \ @@ -83,9 +80,11 @@ struct intc_desc symbol __initdata = { \ chipname, \ _INTC_ARRAY(ack_regs), \ } -#endif void __init register_intc_controller(struct intc_desc *desc); int intc_set_priority(unsigned int irq, unsigned int prio); +int reserve_irq_vector(unsigned int irq); +void reserve_irq_legacy(void); + #endif /* __SH_INTC_H */ |