Commit 6145197be6cc0583fa1a2f4ec1079d366137061e ("i2c: OMAP: Add DT
support for i2c controller") breaks compilation when CONFIG_OF is not
defined:CC drivers/i2c/busses/i2c-omap.o drivers/i2c/busses/i2c-omap.c: In function 'omap_i2c_probe': drivers/i2c/busses/i2c-omap.c:1021:26: error: 'omap_i2c_of_match' undeclared (first use in this function) drivers/i2c/busses/i2c-omap.c:1021:26: note: each undeclared identifier is reported only once for each function it appears in Fix this by avoiding of_*() functions when !CONFIG_OF. Signed-off-by: Paul Walmsley <[email protected]> Cc: Benoit Cousson <[email protected]> Cc: Rob Herring <[email protected]> Cc: Grant Likely <[email protected]> Cc: Kevin Hilman <[email protected]> Cc: Tony Lindgren <[email protected]> --- drivers/i2c/busses/i2c-omap.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index f713eac..1008e96 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -989,7 +989,7 @@ omap_i2c_probe(struct platform_device *pdev) struct resource *mem, *irq, *ioarea; struct omap_i2c_bus_platform_data *pdata = pdev->dev.platform_data; struct device_node *node = pdev->dev.of_node; - const struct of_device_id *match; + const struct of_device_id *match = NULL; irq_handler_t isr; int r; @@ -1018,7 +1018,9 @@ omap_i2c_probe(struct platform_device *pdev) goto err_release_region; } +#ifdef CONFIG_OF match = of_match_device(omap_i2c_of_match, &pdev->dev); +#endif if (match) { u32 freq = 100000; /* default to 100000 Hz */ -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
