diff options
| author | Len Brown <len.brown@intel.com> | 2006-01-07 02:05:40 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-01-07 02:05:40 -0500 |
| commit | add5b5ee992e40c9cd8697ea94c223628be162a7 (patch) | |
| tree | 7f3f279f3e6b41e61d7dfaf4d25a5251024a7185 /drivers/hwmon/sis5595.c | |
| parent | 25da0974601fc8096461f3d3f7ca3aab8e79adfb (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Auto-update from upstream
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 9c6cadec108..8be5189d9bd 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); static void sis5595_init_client(struct i2c_client *client); static struct i2c_driver sis5595_driver = { - .owner = THIS_MODULE, - .name = "sis5595", + .driver = { + .name = "sis5595", + }, .attach_adapter = sis5595_detect, .detach_client = sis5595_detach_client, }; @@ -484,7 +485,8 @@ static int sis5595_detect(struct i2c_adapter *adapter) if (force_addr) address = force_addr & ~(SIS5595_EXTENT - 1); /* Reserve the ISA region */ - if (!request_region(address, SIS5595_EXTENT, sis5595_driver.name)) { + if (!request_region(address, SIS5595_EXTENT, + sis5595_driver.driver.name)) { err = -EBUSY; goto exit; } |