Re: [PATCH] I2C: OMAP: fix build breakage when CONFIG_OF is not set
From: Felipe Balbi <hidden>
Date: 2012-02-08 11:00:06
Also in:
linux-i2c, linux-omap, lkml
On Wed, Feb 08, 2012 at 12:56:52PM +0200, Luciano Coelho wrote:
Since commit 6145197be6cc0583fa1a2f4ec1079d366137061e, building
we generally like to see the commit subject here too. And adding the abbreviated commit instead of the full sha1, wouldn't hurt either ;-)
i2c_omap.c breaks if CONFIG_OF is not set: drivers/i2c/busses/i2c-omap.c: In function 'omap_i2c_probe': drivers/i2c/busses/i2c-omap.c:1021: error: 'omap_i2c_of_match' undeclared (first use in this function) drivers/i2c/busses/i2c-omap.c:1021: error: (Each undeclared identifier is reported only once drivers/i2c/busses/i2c-omap.c:1021: error: for each function it appears in.) This is because the definition of omap_i2c_of_match is #ifdef'd on CONFIG_OF, but the usage of it is not. Since the places where omap_ic2_of_match are prepared to get NULL pointers if CONFIG_OF is not defined, we can simply define it to NULL. Cc: Benoit Cousson <redacted> Signed-off-by: Luciano Coelho <redacted>
after fixing the commit log, you can add: Reviewed-by: Felipe Balbi <redacted> if you want.
quoted hunk ↗ jump to hunk
--- drivers/i2c/busses/i2c-omap.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index f713eac..fd200eb 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c@@ -979,6 +979,8 @@ static const struct of_device_id omap_i2c_of_match[] = { { }, }; MODULE_DEVICE_TABLE(of, omap_i2c_of_match); +#else +static const struct of_device_id *omap_i2c_of_match = NULL; #endif static int __devinit-- 1.7.5.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
-- balbi
Attachments
- signature.asc [application/pgp-signature] 836 bytes