diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-18 20:52:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-18 20:52:27 -0400 |
| commit | 64d9a39ec9ad074384b548c0cead89265c82e166 (patch) | |
| tree | 5c0cdd72f41584d33e76e4a3c08eeb1960a0b5c7 /drivers/i2c | |
| parent | 17e6c600b2bc4f15dd5f9144ccb8b5c5211dd6e4 (diff) | |
| parent | bd452e6f178a559408c54c2b4ca29191b812d47f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/hwmon-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/hwmon-2.6:
hwmon: Fix debug messages in w83781d
hwmon: Let w83781d and lm78 load again
w83627ehf: Fix the detection of fan5
k8temp: Documentation update
smsc47m1: List the SMSC LPC47M112 as supported
hwmon: Fix documentation typos
adm9240: Update Grant Coady's email address
w83791d: Fix unchecked return status
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-isa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-isa.c b/drivers/i2c/busses/i2c-isa.c index 4380653748a4..8ed59a2dff53 100644 --- a/drivers/i2c/busses/i2c-isa.c +++ b/drivers/i2c/busses/i2c-isa.c | |||
| @@ -91,7 +91,7 @@ int i2c_isa_add_driver(struct i2c_driver *driver) | |||
| 91 | /* Now look for clients */ | 91 | /* Now look for clients */ |
| 92 | res = driver->attach_adapter(&isa_adapter); | 92 | res = driver->attach_adapter(&isa_adapter); |
| 93 | if (res) { | 93 | if (res) { |
| 94 | dev_err(&isa_adapter.dev, | 94 | dev_dbg(&isa_adapter.dev, |
| 95 | "Driver %s failed to attach adapter, unregistering\n", | 95 | "Driver %s failed to attach adapter, unregistering\n", |
| 96 | driver->driver.name); | 96 | driver->driver.name); |
| 97 | driver_unregister(&driver->driver); | 97 | driver_unregister(&driver->driver); |