diff options
| author | Len Brown <len.brown@intel.com> | 2006-01-07 03:50:18 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-01-07 03:50:18 -0500 |
| commit | ed03f430cdc8c802652467e9097606fedc2c7abc (patch) | |
| tree | 30941ec1e6f93e99358fefe18175e5dd800a4379 /drivers/hwmon/smsc47m1.c | |
| parent | ed349a8a0a780ed27e2a765f16cee54d9b63bfee (diff) | |
| parent | 6f957eaf79356a32e838f5f262ee9a60544b1d5b (diff) | |
| download | kernel-crypto-ed03f430cdc8c802652467e9097606fedc2c7abc.tar.gz kernel-crypto-ed03f430cdc8c802652467e9097606fedc2c7abc.tar.xz kernel-crypto-ed03f430cdc8c802652467e9097606fedc2c7abc.zip | |
Pull pnpacpi into acpica branch
Diffstat (limited to 'drivers/hwmon/smsc47m1.c')
| -rw-r--r-- | drivers/hwmon/smsc47m1.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c index 5905c1af88f..d1e3ec0fe4d 100644 --- a/drivers/hwmon/smsc47m1.c +++ b/drivers/hwmon/smsc47m1.c @@ -126,8 +126,9 @@ static struct smsc47m1_data *smsc47m1_update_device(struct device *dev, static struct i2c_driver smsc47m1_driver = { - .owner = THIS_MODULE, - .name = "smsc47m1", + .driver = { + .name = "smsc47m1", + }, .attach_adapter = smsc47m1_detect, .detach_client = smsc47m1_detach_client, }; @@ -394,7 +395,7 @@ static int smsc47m1_detect(struct i2c_adapter *adapter) int err = 0; int fan1, fan2, pwm1, pwm2; - if (!request_region(address, SMSC_EXTENT, smsc47m1_driver.name)) { + if (!request_region(address, SMSC_EXTENT, smsc47m1_driver.driver.name)) { dev_err(&adapter->dev, "Region 0x%x already in use!\n", address); return -EBUSY; } |