summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark D. Studebaker <mdsxyz123@yahoo.com>2002-04-02 01:47:58 +0000
committerMark D. Studebaker <mdsxyz123@yahoo.com>2002-04-02 01:47:58 +0000
commitb1766c84807e2be9101f190d4145e804e23b83bc (patch)
tree1d83211b21c7d6efa7d257307e93237abc4d64cb
parent3a64b30550596fce984f60705d016b5498067acb (diff)
downloadlm-sensors-git-b1766c84807e2be9101f190d4145e804e23b83bc.tar.gz
compile fixes
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1343 7894878c-1315-0410-8ee3-d5d059ff63e0
-rw-r--r--kernel/busses/i2c-savage4.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/busses/i2c-savage4.c b/kernel/busses/i2c-savage4.c
index 9f8bc92a..bd84d32a 100644
--- a/kernel/busses/i2c-savage4.c
+++ b/kernel/busses/i2c-savage4.c
@@ -251,7 +251,7 @@ static int voodoo3_setup(void)
dev = NULL;
do {
- if ((dev = pci_find_device(PCI_VENDOR_ID_S3
+ if ((dev = pci_find_device(PCI_VENDOR_ID_S3,
PCI_CHIP_SAVAGE4,
dev))) {
if (!v3_num)
@@ -309,13 +309,15 @@ int __init i2c_voodoo3_init(void)
printk("i2c-voodoo3.o: I2C bus initialized\n");
voodoo3_initialized |= INIT2;
}
+/*
if ((res = i2c_bit_add_bus(&voodoo3_ddc_adapter))) {
printk("i2c-voodoo3.o: DDC adapter registration failed\n");
} else {
printk("i2c-voodoo3.o: DDC bus initialized\n");
voodoo3_initialized |= INIT3;
}
- if(!(voodoo3_initialized & (INIT2 | INIT3))) {
+*/
+ if(!(voodoo3_initialized & (INIT2 /* | INIT3 */ ))) {
printk("i2c-voodoo3.o: Both registrations failed, module not inserted\n");
voodoo3_cleanup();
return res;
@@ -328,6 +330,7 @@ int __init voodoo3_cleanup(void)
int res;
iounmap(mem);
+/*
if (voodoo3_initialized & INIT3) {
if ((res = i2c_bit_del_bus(&voodoo3_ddc_adapter))) {
printk
@@ -335,6 +338,7 @@ int __init voodoo3_cleanup(void)
return res;
}
}
+*/
if (voodoo3_initialized & INIT2) {
if ((res = i2c_bit_del_bus(&voodoo3_i2c_adapter))) {
printk