---

yaml --- r: 347081 b: refs/heads/master c: 8f41405 h: refs/heads/master i: 347079: f816fcc v: v3
git-mirror · Nov 22, 2012 · 6c2577f · 6c2577f
1 parent 44d07b6
commit 6c2577f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c35d3cfdbc8d4fb4358a5bc97a334dbdb86e3d69
+refs/heads/master: 8f414059c66f57f610b71adf66fe20d8811bff8f
diff --git a/trunk/drivers/i2c/busses/i2c-mxs.c b/trunk/drivers/i2c/busses/i2c-mxs.c
@@ -359,7 +359,7 @@ static int mxs_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[],
 
 static u32 mxs_i2c_func(struct i2c_adapter *adap)
 {
-	return I2C_FUNC_I2C | (I2C_FUNC_SMBUS_EMUL & ~I2C_FUNC_SMBUS_QUICK);
+	return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
 }
 
 static irqreturn_t mxs_i2c_isr(int this_irq, void *dev_id)