---

yaml --- r: 319157 b: refs/heads/master c: 8c88ab0 h: refs/heads/master i: 319155: a8ade27 v: v3
git-mirror · Jul 10, 2012 · ee899fd · ee899fd
1 parent 0ef2340
commit ee899fd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f09c672314f8180113429ff36cad09296c40a9f
+refs/heads/master: 8c88ab040115430fc146df7aa5a57538bf6d0e2d
diff --git a/trunk/arch/arm/plat-mxc/include/mach/i2c.h b/trunk/arch/arm/plat-mxc/include/mach/i2c.h
@@ -15,7 +15,7 @@
  *
  **/
 struct imxi2c_platform_data {
-	int bitrate;
+	u32 bitrate;
 };
 
 #endif /* __ASM_ARCH_I2C_H_ */
diff --git a/trunk/drivers/i2c/busses/i2c-imx.c b/trunk/drivers/i2c/busses/i2c-imx.c
@@ -471,8 +471,8 @@ static int __init i2c_imx_probe(struct platform_device *pdev)
 	struct imxi2c_platform_data *pdata = pdev->dev.platform_data;
 	struct pinctrl *pinctrl;
 	void __iomem *base;
-	int irq, bitrate;
-	int ret;
+	int irq, ret;
+	u32 bitrate;
 
 	dev_dbg(&pdev->dev, "<%s>\n", __func__);