From ee899fd2b029d7ec4c3e2d4ce85884ce31bec733 Mon Sep 17 00:00:00 2001
From: Wolfram Sang <wolfram@the-dreams.de>
Date: Sun, 8 Jul 2012 13:11:43 +0200
Subject: [PATCH] --- yaml --- r: 319157 b: refs/heads/master c:
 8c88ab040115430fc146df7aa5a57538bf6d0e2d h: refs/heads/master i:   319155:
 a8ade273d2678306756b076e0428437227ed2b68 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/arm/plat-mxc/include/mach/i2c.h | 2 +-
 trunk/drivers/i2c/busses/i2c-imx.c         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6ac7c4faed87..24b33b78f885 100644
--- 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
index 375cdd0cf876..8289d915e615 100644
--- 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
index dd2a0839b266..90460dd5e5ab 100644
--- 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__);