diff options
author | Jean Delvare <khali@linux-fr.org> | 2005-07-19 17:51:07 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-05 12:14:09 -0400 |
commit | fde0950903ce8cc38a91dd095280decceda2ff82 (patch) | |
tree | 5a970459793ac46ad7082f0d722616730b0589c2 /drivers/hwmon/w83627hf.c | |
parent | 400c455eaa0d0819d18cd42a74070e0e238a73dc (diff) |
[PATCH] I2C: Separate non-i2c hwmon drivers from i2c-core (3/9)
Convert the 10 ISA hardware monitoring drivers (it87, lm78, pc87360,
sis5595, smsc47b397, smsc47m1, via686a, w83627hf, w83627ehf, w83781d) to
explicitely register with i2c-isa. For hybrid drivers (it87, lm78,
w83781d), we now have two separate instances of i2c_driver, one for the
I2C interface of the chip, and one for ISA interface. In the long run,
the one for ISA will be replaced with a different driver type.
At this point, all drivers are working again, except for missing
dependencies in Kconfig.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/hwmon/w83627hf.c')
-rw-r--r-- | drivers/hwmon/w83627hf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c index da2f4992ee2..a2c7cea502c 100644 --- a/drivers/hwmon/w83627hf.c +++ b/drivers/hwmon/w83627hf.c | |||
@@ -42,6 +42,7 @@ | |||
42 | #include <linux/slab.h> | 42 | #include <linux/slab.h> |
43 | #include <linux/jiffies.h> | 43 | #include <linux/jiffies.h> |
44 | #include <linux/i2c.h> | 44 | #include <linux/i2c.h> |
45 | #include <linux/i2c-isa.h> | ||
45 | #include <linux/i2c-sensor.h> | 46 | #include <linux/i2c-sensor.h> |
46 | #include <linux/i2c-vid.h> | 47 | #include <linux/i2c-vid.h> |
47 | #include <linux/hwmon.h> | 48 | #include <linux/hwmon.h> |
@@ -1507,12 +1508,12 @@ static int __init sensors_w83627hf_init(void) | |||
1507 | } | 1508 | } |
1508 | normal_isa[0] = addr; | 1509 | normal_isa[0] = addr; |
1509 | 1510 | ||
1510 | return i2c_add_driver(&w83627hf_driver); | 1511 | return i2c_isa_add_driver(&w83627hf_driver); |
1511 | } | 1512 | } |
1512 | 1513 | ||
1513 | static void __exit sensors_w83627hf_exit(void) | 1514 | static void __exit sensors_w83627hf_exit(void) |
1514 | { | 1515 | { |
1515 | i2c_del_driver(&w83627hf_driver); | 1516 | i2c_isa_del_driver(&w83627hf_driver); |
1516 | } | 1517 | } |
1517 | 1518 | ||
1518 | MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>, " | 1519 | MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>, " |