diff options
| author | Jean Delvare <khali@linux-fr.org> | 2005-07-19 23:51:07 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-05 09:14:09 -0700 |
| commit | fde0950903ce8cc38a91dd095280decceda2ff82 (patch) | |
| tree | 5a970459793ac46ad7082f0d722616730b0589c2 /drivers/hwmon/sis5595.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/sis5595.c')
| -rw-r--r-- | drivers/hwmon/sis5595.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c index ea5934f89f0..e5db835d63f 100644 --- a/drivers/hwmon/sis5595.c +++ b/drivers/hwmon/sis5595.c @@ -55,6 +55,7 @@ #include <linux/ioport.h> #include <linux/pci.h> #include <linux/i2c.h> +#include <linux/i2c-isa.h> #include <linux/i2c-sensor.h> #include <linux/hwmon.h> #include <linux/err.h> @@ -790,7 +791,7 @@ static int __devinit sis5595_pci_probe(struct pci_dev *dev, normal_isa[0] = addr; s_bridge = pci_dev_get(dev); - if (i2c_add_driver(&sis5595_driver)) { + if (i2c_isa_add_driver(&sis5595_driver)) { pci_dev_put(s_bridge); s_bridge = NULL; } @@ -817,7 +818,7 @@ static void __exit sm_sis5595_exit(void) { pci_unregister_driver(&sis5595_pci_driver); if (s_bridge != NULL) { - i2c_del_driver(&sis5595_driver); + i2c_isa_del_driver(&sis5595_driver); pci_dev_put(s_bridge); s_bridge = NULL; } |