diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
| commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
| tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /drivers/hwmon/w83627ehf.c | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'drivers/hwmon/w83627ehf.c')
| -rw-r--r-- | drivers/hwmon/w83627ehf.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c index eee22a57e929..12d79f5e4900 100644 --- a/drivers/hwmon/w83627ehf.c +++ b/drivers/hwmon/w83627ehf.c | |||
| @@ -676,7 +676,7 @@ static int w83627ehf_detect(struct i2c_adapter *adapter) | |||
| 676 | int i, err = 0; | 676 | int i, err = 0; |
| 677 | 677 | ||
| 678 | if (!request_region(address + REGION_OFFSET, REGION_LENGTH, | 678 | if (!request_region(address + REGION_OFFSET, REGION_LENGTH, |
| 679 | w83627ehf_driver.name)) { | 679 | w83627ehf_driver.driver.name)) { |
| 680 | err = -EBUSY; | 680 | err = -EBUSY; |
| 681 | goto exit; | 681 | goto exit; |
| 682 | } | 682 | } |
| @@ -785,8 +785,9 @@ static int w83627ehf_detach_client(struct i2c_client *client) | |||
| 785 | } | 785 | } |
| 786 | 786 | ||
| 787 | static struct i2c_driver w83627ehf_driver = { | 787 | static struct i2c_driver w83627ehf_driver = { |
| 788 | .owner = THIS_MODULE, | 788 | .driver = { |
| 789 | .name = "w83627ehf", | 789 | .name = "w83627ehf", |
| 790 | }, | ||
| 790 | .attach_adapter = w83627ehf_detect, | 791 | .attach_adapter = w83627ehf_detect, |
| 791 | .detach_client = w83627ehf_detach_client, | 792 | .detach_client = w83627ehf_detach_client, |
| 792 | }; | 793 | }; |