projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
drivers
/
hwmon
/
pcf8591.c
diff --git
a/drivers/hwmon/pcf8591.c
b/drivers/hwmon/pcf8591.c
index 1d7ffebd679d0cce6f25c9e1946d7e9739c1b4b5..d447879498516d9f385bf37070f8ff0f3fc10f23 100644
(file)
--- a/
drivers/hwmon/pcf8591.c
+++ b/
drivers/hwmon/pcf8591.c
@@
-29,7
+29,6
@@
static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
/* Insmod parameters */
0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
/* Insmod parameters */
-I2C_CLIENT_INSMOD_1(pcf8591);
static int input_mode;
module_param(input_mode, int, 0);
static int input_mode;
module_param(input_mode, int, 0);
@@
-169,7
+168,7
@@
static const struct attribute_group pcf8591_attr_group_opt = {
*/
/* Return 0 if detection is successful, -ENODEV otherwise */
*/
/* Return 0 if detection is successful, -ENODEV otherwise */
-static int pcf8591_detect(struct i2c_client *client,
int kind,
+static int pcf8591_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;
@@
-299,7
+298,7
@@
static struct i2c_driver pcf8591_driver = {
.class = I2C_CLASS_HWMON, /* Nearest choice */
.detect = pcf8591_detect,
.class = I2C_CLASS_HWMON, /* Nearest choice */
.detect = pcf8591_detect,
- .address_
data = &addr_data
,
+ .address_
list = normal_i2c
,
};
static int __init pcf8591_init(void)
};
static int __init pcf8591_init(void)