diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-14 01:02:32 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-14 01:02:32 -0500 |
| commit | ac98695d6c1508b724f246f38ce57fb4e3cec356 (patch) | |
| tree | 189969a3689b9b83eaf39314a7942cc781ff836b /drivers/hwmon | |
| parent | d9bc125caf592b7d081021f32ce5b717efdf70c8 (diff) | |
| parent | 93bbad8fe13a25dcf7f3bc628a71d1a7642ae61b (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/vt8231.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c index 93f93d4fb8ae..a6a4aa0eee16 100644 --- a/drivers/hwmon/vt8231.c +++ b/drivers/hwmon/vt8231.c | |||
| @@ -727,7 +727,6 @@ int vt8231_detect(struct i2c_adapter *adapter) | |||
| 727 | client->addr = isa_address; | 727 | client->addr = isa_address; |
| 728 | client->adapter = adapter; | 728 | client->adapter = adapter; |
| 729 | client->driver = &vt8231_driver; | 729 | client->driver = &vt8231_driver; |
| 730 | client->dev.parent = &adapter->dev; | ||
| 731 | 730 | ||
| 732 | /* Fill in the remaining client fields and put into the global list */ | 731 | /* Fill in the remaining client fields and put into the global list */ |
| 733 | strlcpy(client->name, "vt8231", I2C_NAME_SIZE); | 732 | strlcpy(client->name, "vt8231", I2C_NAME_SIZE); |