From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 8 Nov 2010 08:02:26 +0000 (+0900)
Subject: sh: intc: Fix up initializers for gcc 4.5.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=99870bd784ff9eb2405eab060125c0ded74968cd;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

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)	\