[S390] noexec protection

[linux-2.6-omap-h63xx.git] / drivers / i2c / busses / i2c-via.c

diff --git a/drivers/i2c/busses/i2c-via.c b/drivers/i2c/busses/i2c-via.c
index 544a38e64394613e1422d55fb4d9833e9b9f70d0..15d7e00e47e6a7b3edb93d9321eefdcee01f6847 100644 (file)
--- a/drivers/i2c/busses/i2c-via.c
+++ b/drivers/i2c/busses/i2c-via.c
@@ -81,7 +81,6 @@ static struct i2c_algo_bit_data bit_data = {
        .getsda         = bit_via_getsda,
        .getscl         = bit_via_getscl,
        .udelay         = 5,
-       .mdelay         = 5,
        .timeout        = HZ
 };
 
@@ -152,14 +151,13 @@ static int __devinit vt586b_probe(struct pci_dev *dev, const struct pci_device_i
 
 static void __devexit vt586b_remove(struct pci_dev *dev)
 {
-       i2c_bit_del_bus(&vt586b_adapter);
+       i2c_del_adapter(&vt586b_adapter);
        release_region(I2C_DIR, IOSPACE);
        pm_io_base = 0;
 }
 
 
 static struct pci_driver vt586b_driver = {
-       .owner          = THIS_MODULE,
        .name           = "vt586b_smbus",
        .id_table       = vt586b_ids,
        .probe          = vt586b_probe,