summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBalaji T K <balajitk@ti.com>2011-02-22 12:25:39 +0530
committerBen Dooks <ben-linux@fluff.org>2011-02-23 00:39:45 +0000
commitf72487e7a1827f5e95425b80ec4fcc4f928329e8 (patch)
tree8a17c836ea249ef61ffe275953aa27eb061e6d58 /drivers
parentadf6e07922255937c8bfeea777d19502b4c9a2be (diff)
downloadlinux-3.10-f72487e7a1827f5e95425b80ec4fcc4f928329e8.tar.gz
linux-3.10-f72487e7a1827f5e95425b80ec4fcc4f928329e8.tar.bz2
linux-3.10-f72487e7a1827f5e95425b80ec4fcc4f928329e8.zip
i2c-omap: fix build for !CONFIG_SUSPEND
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> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i2c/busses/i2c-omap.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 0541df90b9f..adc1ee53b1a 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,
},
};