[PATCH] OMAP1: PM: fix omap1 build
From: Kevin Hilman <hidden>
Date: 2011-02-12 00:13:14
Also in:
linux-omap
Hi Manju, "G, Manjunath Kondaiah" [off-list ref] writes:
quoted hunk
The omap1_defconfig build on pm branch throughs below build error: CC drivers/i2c/busses/i2c-omap.o drivers/i2c/busses/i2c-omap.c:1173: error: lvalue required as unary '&' operand make[3]: *** [drivers/i2c/busses/i2c-omap.o] Error 1 make[2]: *** [drivers/i2c/busses] Error 2 make[1]: *** [drivers/i2c] Error 2 make: *** [drivers] Error 2 Fix above build error. Boot tested on omap1710(h3) board. Signed-off-by: G, Manjunath Kondaiah <redacted> --- drivers/i2c/busses/i2c-omap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 0541df9..8db456f 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c@@ -1170,7 +1170,7 @@ static struct platform_driver omap_i2c_driver = { .driver = { .name = "omap_i2c", .owner = THIS_MODULE, - .pm = &omap_i2c_pm_ops, + .pm = omap_i2c_pm_ops, }, };
This might fix the compile on OMAP1, but it then breaks the build for OMAP2+ when CONFIG_PM is enabled. This isn't really an OMAP1 issue, rather it's a !CONFIG_PM issue. The right fix will be to make the #else clause of the #ifdef CONFIG_PM correct for all OMAPs. Also, please Cc Ben Dooks and the linux-i2c list on I2C driver patches (MAINTAINERS entry below.) Thanks, Kevin I2C SUBSYSTEM M: "Jean Delvare (PC drivers, core)" [off-list ref] M: "Ben Dooks (embedded platforms)" [off-list ref] L: linux-i2c at vger.kernel.org W: http://i2c.wiki.kernel.org/ T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ T: git git://git.fluff.org/bjdooks/linux.git S: Maintained F: Documentation/i2c/ F: drivers/i2c/ F: include/linux/i2c.h F: include/linux/i2c-*.h