aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/via686a.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-01-07 02:05:40 -0500
committerLen Brown <len.brown@intel.com>2006-01-07 02:05:40 -0500
commitadd5b5ee992e40c9cd8697ea94c223628be162a7 (patch)
tree7f3f279f3e6b41e61d7dfaf4d25a5251024a7185 /drivers/hwmon/via686a.c
parent25da0974601fc8096461f3d3f7ca3aab8e79adfb (diff)
parent0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff)
downloadkernel_goldelico_gta04-add5b5ee992e40c9cd8697ea94c223628be162a7.zip
kernel_goldelico_gta04-add5b5ee992e40c9cd8697ea94c223628be162a7.tar.gz
kernel_goldelico_gta04-add5b5ee992e40c9cd8697ea94c223628be162a7.tar.bz2
Auto-update from upstream
Diffstat (limited to 'drivers/hwmon/via686a.c')
-rw-r--r--drivers/hwmon/via686a.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c
index 6f696f8..cb01848 100644
--- a/drivers/hwmon/via686a.c
+++ b/drivers/hwmon/via686a.c
@@ -572,8 +572,9 @@ static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
/* The driver. I choose to use type i2c_driver, as at is identical to both
smbus_driver and isa_driver, and clients could be of either kind */
static struct i2c_driver via686a_driver = {
- .owner = THIS_MODULE,
- .name = "via686a",
+ .driver = {
+ .name = "via686a",
+ },
.attach_adapter = via686a_detect,
.detach_client = via686a_detach_client,
};
@@ -615,7 +616,8 @@ static int via686a_detect(struct i2c_adapter *adapter)
}
/* Reserve the ISA region */
- if (!request_region(address, VIA686A_EXTENT, via686a_driver.name)) {
+ if (!request_region(address, VIA686A_EXTENT,
+ via686a_driver.driver.name)) {
dev_err(&adapter->dev, "region 0x%x already in use!\n",
address);
return -ENODEV;