i2c-omap: Fix mismerge

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

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 71b37ed4b72c1b246b600390cb3db94ed01b76ca..0c3ed419c69a731dd44ecdf58900f333e30d0e1a 100644 (file)
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -774,7 +774,7 @@ omap_i2c_probe(struct platform_device *pdev)
        struct omap_i2c_dev     *dev;
        struct i2c_adapter      *adap;
        struct resource         *mem, *irq, *ioarea;
-       void *isr;
+       irq_handler_t isr;
        int r;
        u32 speed = 0;