diff options
| author | James Morris <jmorris@namei.org> | 2010-11-28 16:27:07 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-11-28 16:27:07 -0500 |
| commit | 1d6d75684d869406e5bb2ac5d3ed9454f52d0cab (patch) | |
| tree | afb229254bed6415407b7b7d4641f9f792109966 /include/linux/sh_intc.h | |
| parent | 074e61ec3751da9ab88ee66d3818574556c03489 (diff) | |
| parent | 0f639a3c5ca63dd76ee07de9b02ebf0178ce9a17 (diff) | |
Merge branch 'master' into next
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) \ |