From: Tony Lindgren <tony@atomide.com>
Date: Mon, 11 Aug 2008 14:45:32 +0000 (+0300)
Subject: I2C: Fix isp1301_omap.c compile
X-Git-Tag: v2.6.27-omap1~325
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d12a00e66e97f2e808217eb3e9c9e88d4a281530;p=linux-2.6-omap-h63xx.git

I2C: Fix isp1301_omap.c compile

Fix isp1301_omap.c compile

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index c2506681855..71a0a2e23f1 100644
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -1210,7 +1210,7 @@ static void isp1301_release(struct device *dev)
 {
 	struct isp1301	*isp;
 
-	isp = device_get_drvdata(dev);
+	isp = dev_get_drvdata(dev);
 
 	/* ugly -- i2c hijacks our memory hook to wait_for_completion() */
 	if (isp->i2c_release)
@@ -1564,7 +1564,7 @@ static int __init isp1301_probe(struct i2c_client *i2c)
 	if (machine_is_omap_h2()) {
 		/* full speed signaling by default */
 		isp1301_set_bits(isp, ISP1301_MODE_CONTROL_1,
-			MC1_SPEED_REG);
+			MC1_SPEED);
 		isp1301_set_bits(isp, ISP1301_MODE_CONTROL_2,
 			MC2_SPD_SUSP_CTRL);