From: Balaji T K <balajitk@ti.com>
To: linux-i2c@vger.kernel.org, ben-linux@fluff.org
Cc: linux-omap@vger.kernel.org, khilman@ti.com, Balaji T K <balajitk@ti.com>
Subject: [PATCH] i2c-omap: fix build for !CONFIG_SUSPEND
Date: Tue, 22 Feb 2011 12:25:39 +0530 [thread overview]
Message-ID: <1298357739-5132-1-git-send-email-balajitk@ti.com> (raw)
fix the build break when !CONFIG_SUSPEND
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
Signed-off-by: Balaji T K <balajitk@ti.com>
---
introduced by commit f6f98d72575031b0c03416a28a0d580128114b74
applies on i2c-fixes branch
drivers/i2c/busses/i2c-omap.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 0541df9..adc1ee5 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1160,8 +1160,9 @@ static struct dev_pm_ops omap_i2c_pm_ops = {
.suspend = omap_i2c_suspend,
.resume = omap_i2c_resume,
};
+#define OMAP_I2C_PM_OPS (&omap_i2c_pm_ops)
#else
-#define omap_i2c_pm_ops NULL
+#define OMAP_I2C_PM_OPS NULL
#endif
static struct platform_driver omap_i2c_driver = {
@@ -1170,7 +1171,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,
},
};
--
1.7.0.4
next reply other threads:[~2011-02-22 6:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-22 6:55 Balaji T K [this message]
[not found] ` <1298357739-5132-1-git-send-email-balajitk-l0cyMroinI0@public.gmane.org>
2011-03-01 0:48 ` [PATCH] i2c-omap: fix build for !CONFIG_SUSPEND Kevin Hilman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1298357739-5132-1-git-send-email-balajitk@ti.com \
--to=balajitk@ti.com \
--cc=ben-linux@fluff.org \
--cc=khilman@ti.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).