diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-18 03:35:56 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-18 03:35:56 -0500 |
| commit | 0421860a5a75b59a76b7a864a172eb090e3d0785 (patch) | |
| tree | df22f28abfa4c8bb77d650b674a44e0aedc586be /include/linux/sh_intc.h | |
| parent | cf655c36fad7b6488a56f18ab56f7d608ca6552b (diff) | |
| parent | 89ba4d12fca24d373e1b10fce498d68157bafaf0 (diff) | |
Merge branch 'rmobile/ag5' into rmobile-latest
Diffstat (limited to 'include/linux/sh_intc.h')
| -rw-r--r-- | include/linux/sh_intc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sh_intc.h b/include/linux/sh_intc.h index f656d1a43dc0..5812fefbcedf 100644 --- a/include/linux/sh_intc.h +++ b/include/linux/sh_intc.h | |||
| @@ -79,7 +79,7 @@ struct intc_hw_desc { | |||
| 79 | unsigned int nr_subgroups; | 79 | unsigned int nr_subgroups; |
| 80 | }; | 80 | }; |
| 81 | 81 | ||
| 82 | #define _INTC_ARRAY(a) a, a == NULL ? 0 : sizeof(a)/sizeof(*a) | 82 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) |
| 83 | 83 | ||
| 84 | #define INTC_HW_DESC(vectors, groups, mask_regs, \ | 84 | #define INTC_HW_DESC(vectors, groups, mask_regs, \ |
| 85 | prio_regs, sense_regs, ack_regs) \ | 85 | prio_regs, sense_regs, ack_regs) \ |