diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/hwmon/tmp102.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
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 93187c3cb5e7..5bd194968801 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 | } |