diff options
Diffstat (limited to 'include/asm-sh')
-rw-r--r-- | include/asm-sh/hw_irq.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/include/asm-sh/hw_irq.h b/include/asm-sh/hw_irq.h index cb0b6c9f7020..c958fdaa0095 100644 --- a/include/asm-sh/hw_irq.h +++ b/include/asm-sh/hw_irq.h | |||
@@ -33,13 +33,6 @@ struct intc_vect { | |||
33 | #define INTC_VECT(enum_id, vect) { enum_id, vect } | 33 | #define INTC_VECT(enum_id, vect) { enum_id, vect } |
34 | #define INTC_IRQ(enum_id, irq) INTC_VECT(enum_id, irq2evt(irq)) | 34 | #define INTC_IRQ(enum_id, irq) INTC_VECT(enum_id, irq2evt(irq)) |
35 | 35 | ||
36 | struct intc_prio { | ||
37 | intc_enum enum_id; | ||
38 | unsigned char priority; | ||
39 | }; | ||
40 | |||
41 | #define INTC_PRIO(enum_id, prio) { enum_id, prio } | ||
42 | |||
43 | struct intc_group { | 36 | struct intc_group { |
44 | intc_enum enum_id; | 37 | intc_enum enum_id; |
45 | intc_enum enum_ids[32]; | 38 | intc_enum enum_ids[32]; |
@@ -79,8 +72,6 @@ struct intc_desc { | |||
79 | unsigned int nr_vectors; | 72 | unsigned int nr_vectors; |
80 | struct intc_group *groups; | 73 | struct intc_group *groups; |
81 | unsigned int nr_groups; | 74 | unsigned int nr_groups; |
82 | struct intc_prio *priorities; | ||
83 | unsigned int nr_priorities; | ||
84 | struct intc_mask_reg *mask_regs; | 75 | struct intc_mask_reg *mask_regs; |
85 | unsigned int nr_mask_regs; | 76 | unsigned int nr_mask_regs; |
86 | struct intc_prio_reg *prio_regs; | 77 | struct intc_prio_reg *prio_regs; |
@@ -92,10 +83,9 @@ struct intc_desc { | |||
92 | 83 | ||
93 | #define _INTC_ARRAY(a) a, sizeof(a)/sizeof(*a) | 84 | #define _INTC_ARRAY(a) a, sizeof(a)/sizeof(*a) |
94 | #define DECLARE_INTC_DESC(symbol, chipname, vectors, groups, \ | 85 | #define DECLARE_INTC_DESC(symbol, chipname, vectors, groups, \ |
95 | priorities, mask_regs, prio_regs, sense_regs) \ | 86 | mask_regs, prio_regs, sense_regs) \ |
96 | struct intc_desc symbol __initdata = { \ | 87 | struct intc_desc symbol __initdata = { \ |
97 | _INTC_ARRAY(vectors), _INTC_ARRAY(groups), \ | 88 | _INTC_ARRAY(vectors), _INTC_ARRAY(groups), \ |
98 | _INTC_ARRAY(priorities), \ | ||
99 | _INTC_ARRAY(mask_regs), _INTC_ARRAY(prio_regs), \ | 89 | _INTC_ARRAY(mask_regs), _INTC_ARRAY(prio_regs), \ |
100 | _INTC_ARRAY(sense_regs), \ | 90 | _INTC_ARRAY(sense_regs), \ |
101 | chipname, \ | 91 | chipname, \ |