fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / i2c / busses / i2c-i810.c

diff --git a/drivers/i2c/busses/i2c-i810.c b/drivers/i2c/busses/i2c-i810.c
index 748be30..10c98bc 100644 (file)
--- a/drivers/i2c/busses/i2c-i810.c
+++ b/drivers/i2c/busses/i2c-i810.c
@@ -166,7 +166,6 @@ static struct i2c_algo_bit_data i810_i2c_bit_data = {
        .getsda         = bit_i810i2c_getsda,
        .getscl         = bit_i810i2c_getscl,
        .udelay         = CYCLE_DELAY,
-       .mdelay         = CYCLE_DELAY,
        .timeout        = TIMEOUT,
 };
 
@@ -182,7 +181,6 @@ static struct i2c_algo_bit_data i810_ddc_bit_data = {
        .getsda         = bit_i810ddc_getsda,
        .getscl         = bit_i810ddc_getscl,
        .udelay         = CYCLE_DELAY,
-       .mdelay         = CYCLE_DELAY,
        .timeout        = TIMEOUT,
 };
 
@@ -221,14 +219,14 @@ static int __devinit i810_probe(struct pci_dev *dev, const struct pci_device_id
                return retval;
        retval = i2c_bit_add_bus(&i810_ddc_adapter);
        if (retval)
-               i2c_bit_del_bus(&i810_i2c_adapter);
+               i2c_del_adapter(&i810_i2c_adapter);
        return retval;
 }
 
 static void __devexit i810_remove(struct pci_dev *dev)
 {
-       i2c_bit_del_bus(&i810_ddc_adapter);
-       i2c_bit_del_bus(&i810_i2c_adapter);
+       i2c_del_adapter(&i810_ddc_adapter);
+       i2c_del_adapter(&i810_i2c_adapter);
        iounmap(ioaddr);
 }