summaryrefslogtreecommitdiff
path: root/include/linux/sh_intc.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-11-08 11:02:26 +0300
committerPaul Mundt <lethal@linux-sh.org>2010-11-09 10:38:20 +0300
commit99870bd784ff9eb2405eab060125c0ded74968cd (patch)
treee0c24923ae2453440de4b5d881451405aa473541 /include/linux/sh_intc.h
parenta7bcf21e60c73cb7f7c13fad928967d7e47c3cac (diff)
downloadlinux-99870bd784ff9eb2405eab060125c0ded74968cd.tar.xz
sh: intc: Fix up initializers for gcc 4.5.
The _INTC_ARRAY() initializer presently does a NULL test which blows up as a non-constant initializer under gcc 4.5. This switches over to a type test to account for NULL initializers explicitly. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include/linux/sh_intc.h')
-rw-r--r--include/linux/sh_intc.h2
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 {
unsigned int nr_subgroups;
};
-#define _INTC_ARRAY(a) a, a == NULL ? 0 : sizeof(a)/sizeof(*a)
+#define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a)
#define INTC_HW_DESC(vectors, groups, mask_regs, \
prio_regs, sense_regs, ack_regs) \