From af4b63c9fa79d3cd3b1ada5e18915ced22768d48 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Thu, 23 Sep 2010 09:04:03 +0200 Subject: [PATCH] --- yaml --- r: 220981 b: refs/heads/master c: 5680bc6ec71f303956f5aa999a3c13e13466c561 h: refs/heads/master i: 220979: 42587ccdcb58dade44be7b89a168be6a1530304a v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-nomadik.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 19fa864ba6c5..36f4f25aed60 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ef4f4e4afd55b6015d5b283172d240e22c91854 +refs/heads/master: 5680bc6ec71f303956f5aa999a3c13e13466c561 diff --git a/trunk/drivers/i2c/busses/i2c-nomadik.c b/trunk/drivers/i2c/busses/i2c-nomadik.c index b2dbf7c468af..e461de7167e7 100644 --- a/trunk/drivers/i2c/busses/i2c-nomadik.c +++ b/trunk/drivers/i2c/busses/i2c-nomadik.c @@ -803,10 +803,7 @@ static irqreturn_t i2c_irq_handler(int irq, void *arg) static unsigned int nmk_i2c_functionality(struct i2c_adapter *adap) { - return I2C_FUNC_I2C - | I2C_FUNC_SMBUS_BYTE_DATA - | I2C_FUNC_SMBUS_WORD_DATA - | I2C_FUNC_SMBUS_I2C_BLOCK; + return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; } static const struct i2c_algorithm nmk_i2c_algo = {