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/sis5595.c | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'drivers/hwmon/sis5595.c')
| -rw-r--r-- | drivers/hwmon/sis5595.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c index 9c6cadec1087..8be5189d9bd9 100644 --- a/drivers/hwmon/sis5595.c +++ b/drivers/hwmon/sis5595.c | |||
| @@ -198,8 +198,9 @@ static struct sis5595_data *sis5595_update_device(struct device *dev); | |||
| 198 | static void sis5595_init_client(struct i2c_client *client); | 198 | static void sis5595_init_client(struct i2c_client *client); |
| 199 | 199 | ||
| 200 | static struct i2c_driver sis5595_driver = { | 200 | static struct i2c_driver sis5595_driver = { |
| 201 | .owner = THIS_MODULE, | 201 | .driver = { |
| 202 | .name = "sis5595", | 202 | .name = "sis5595", |
| 203 | }, | ||
| 203 | .attach_adapter = sis5595_detect, | 204 | .attach_adapter = sis5595_detect, |
| 204 | .detach_client = sis5595_detach_client, | 205 | .detach_client = sis5595_detach_client, |
| 205 | }; | 206 | }; |
| @@ -484,7 +485,8 @@ static int sis5595_detect(struct i2c_adapter *adapter) | |||
| 484 | if (force_addr) | 485 | if (force_addr) |
| 485 | address = force_addr & ~(SIS5595_EXTENT - 1); | 486 | address = force_addr & ~(SIS5595_EXTENT - 1); |
| 486 | /* Reserve the ISA region */ | 487 | /* Reserve the ISA region */ |
| 487 | if (!request_region(address, SIS5595_EXTENT, sis5595_driver.name)) { | 488 | if (!request_region(address, SIS5595_EXTENT, |
| 489 | sis5595_driver.driver.name)) { | ||
| 488 | err = -EBUSY; | 490 | err = -EBUSY; |
| 489 | goto exit; | 491 | goto exit; |
| 490 | } | 492 | } |