Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

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

diff --git a/drivers/i2c/busses/i2c-isa.c b/drivers/i2c/busses/i2c-isa.c
index a60f4801757e2dbf5ac9d8697ce9a2beee0262db..03672c9ca4092ade4a0590d598b38a9fda259147 100644 (file)
--- a/drivers/i2c/busses/i2c-isa.c
+++ b/drivers/i2c/busses/i2c-isa.c
@@ -38,19 +38,19 @@
 #include <linux/errno.h>
 #include <linux/i2c.h>
 #include <linux/i2c-isa.h>
+#include <linux/platform_device.h>
 
 static u32 isa_func(struct i2c_adapter *adapter);
 
 /* This is the actual algorithm we define */
 static struct i2c_algorithm isa_algorithm = {
-       .name           = "ISA bus algorithm",
-       .id             = I2C_ALGO_ISA,
        .functionality  = isa_func,
 };
 
 /* There can only be one... */
 static struct i2c_adapter isa_adapter = {
        .owner          = THIS_MODULE,
+       .id             = I2C_HW_ISA,
        .class          = I2C_CLASS_HWMON,
        .algo           = &isa_algorithm,
        .name           = "ISA main adapter",
@@ -93,6 +93,7 @@ int i2c_isa_add_driver(struct i2c_driver *driver)
 
        /* Add the driver to the list of i2c drivers in the driver core */
        driver->driver.name = driver->name;
+       driver->driver.owner = driver->owner;
        driver->driver.bus = &i2c_bus_type;
        driver->driver.probe = i2c_isa_device_probe;
        driver->driver.remove = i2c_isa_device_remove;