diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/hwmon/tmp102.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/hwmon/tmp102.c')
| -rw-r--r-- | drivers/hwmon/tmp102.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c index 93187c3cb5e..5bd19496880 100644 --- a/drivers/hwmon/tmp102.c +++ b/drivers/hwmon/tmp102.c | |||
| @@ -166,7 +166,7 @@ static int __devinit tmp102_probe(struct i2c_client *client, | |||
| 166 | 166 | ||
| 167 | if (!i2c_check_functionality(client->adapter, | 167 | if (!i2c_check_functionality(client->adapter, |
| 168 | I2C_FUNC_SMBUS_WORD_DATA)) { | 168 | I2C_FUNC_SMBUS_WORD_DATA)) { |
| 169 | dev_err(&client->dev, "adapter doesnt support SMBus word " | 169 | dev_err(&client->dev, "adapter doesn't support SMBus word " |
| 170 | "transactions\n"); | 170 | "transactions\n"); |
| 171 | return -ENODEV; | 171 | return -ENODEV; |
| 172 | } | 172 | } |