git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nfsd4: don't sleep in lease-break callback
[safe/jmp/linux-2.6]
/
drivers
/
hwmon
/
max6650.c
diff --git
a/drivers/hwmon/max6650.c
b/drivers/hwmon/max6650.c
index
1da561e
..
a0160ee
100644
(file)
--- 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);
module_param(prescaler, int, S_IRUGO);
module_param(clock, int, S_IRUGO);
-I2C_CLIENT_INSMOD_1(max6650);
-
/*
* MAX 6650/6651 registers
*/
/*
* 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_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);
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[] = {
*/
static const struct i2c_device_id max6650_id[] = {
- { "max6650",
max665
0 },
+ { "max6650", 0 },
{ }
};
MODULE_DEVICE_TABLE(i2c, max6650_id);
{ }
};
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,
.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 */
*/
/* 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;
struct i2c_board_info *info)
{
struct i2c_adapter *adapter = client->adapter;