All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] I2C: OMAP: fix build breakage when CONFIG_OF is not set
@ 2012-02-08 10:56 Luciano Coelho
  2012-02-08 10:59   ` Felipe Balbi
  2012-02-08 11:01   ` Luciano Coelho
  0 siblings, 2 replies; 13+ messages in thread
From: Luciano Coelho @ 2012-02-08 10:56 UTC (permalink / raw)
  To: linux-i2c, linux-omap, linux-kernel
  Cc: tony, khali, ben-linux, w.sang, grant.likely, rob.herring,
	devicetree-discuss, Benoit Cousson

Since commit 6145197be6cc0583fa1a2f4ec1079d366137061e, building
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 <b-cousson@ti.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
---
 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


^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2012-02-08 15:54 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-08 10:56 [PATCH] I2C: OMAP: fix build breakage when CONFIG_OF is not set Luciano Coelho
2012-02-08 10:59 ` Felipe Balbi
2012-02-08 10:59   ` Felipe Balbi
2012-02-08 11:04   ` Luciano Coelho
2012-02-08 11:12     ` Shubhrajyoti Datta
2012-02-08 11:12       ` Shubhrajyoti Datta
2012-02-08 11:25       ` Luciano Coelho
2012-02-08 11:25         ` Luciano Coelho
2012-02-08 15:48         ` Cousson, Benoit
2012-02-08 15:48           ` Cousson, Benoit
2012-02-08 15:54           ` Coelho, Luciano
2012-02-08 11:01 ` Luciano Coelho
2012-02-08 11:01   ` Luciano Coelho

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.