diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-02-02 23:10:39 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-02-02 23:10:39 +0100 |
| commit | e1a0bdd8022317e98650e70850de73eccfcde5ad (patch) | |
| tree | 462f63307118b95c8cbacee6954e4d09ee85b8d1 /drivers/hwmon/max6650.c | |
| parent | 8127f4e883666c9960cfa89cffd36313748f8bab (diff) | |
| parent | 1a45dcfe2525e9432cb4aba461d4994fc2befe42 (diff) | |
| download | kernel-crypto-e1a0bdd8022317e98650e70850de73eccfcde5ad.tar.gz kernel-crypto-e1a0bdd8022317e98650e70850de73eccfcde5ad.tar.xz kernel-crypto-e1a0bdd8022317e98650e70850de73eccfcde5ad.zip | |
Merge branch 'master' into upstream
Conflicts:
drivers/hid/hid-ids.h
Diffstat (limited to 'drivers/hwmon/max6650.c')
| -rw-r--r-- | drivers/hwmon/max6650.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/hwmon/max6650.c b/drivers/hwmon/max6650.c index 1da561e0cb3..a0160ee5cae 100644 --- a/drivers/hwmon/max6650.c +++ b/drivers/hwmon/max6650.c @@ -62,8 +62,6 @@ module_param(fan_voltage, int, S_IRUGO); module_param(prescaler, int, S_IRUGO); module_param(clock, int, S_IRUGO); -I2C_CLIENT_INSMOD_1(max6650); - /* * MAX 6650/6651 registers */ @@ -116,7 +114,7 @@ I2C_CLIENT_INSMOD_1(max6650); static int max6650_probe(struct i2c_client *client, const struct i2c_device_id *id); -static int max6650_detect(struct i2c_client *client, int kind, +static int max6650_detect(struct i2c_client *client, struct i2c_board_info *info); static int max6650_init_client(struct i2c_client *client); static int max6650_remove(struct i2c_client *client); @@ -127,7 +125,7 @@ static struct max6650_data *max6650_update_device(struct device *dev); */ static const struct i2c_device_id max6650_id[] = { - { "max6650", max6650 }, + { "max6650", 0 }, { } }; MODULE_DEVICE_TABLE(i2c, max6650_id); @@ -141,7 +139,7 @@ static struct i2c_driver max6650_driver = { .remove = max6650_remove, .id_table = max6650_id, .detect = max6650_detect, - .address_data = &addr_data, + .address_list = normal_i2c, }; /* @@ -528,7 +526,7 @@ static struct attribute_group max6650_attr_grp = { */ /* Return 0 if detection is successful, -ENODEV otherwise */ -static int max6650_detect(struct i2c_client *client, int kind, +static int max6650_detect(struct i2c_client *client, struct i2c_board_info *info) { struct i2c_adapter *adapter = client->adapter; |