From beb45c5ac8111b6307bf89717315db6ef21f5689 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Fri, 20 Feb 2009 10:48:01 -0800 Subject: [PATCH] i2c-omap: Fix mismerge Signed-off-by: Tony Lindgren --- drivers/i2c/busses/i2c-omap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 71b37ed4b72..0c3ed419c69 100644 --- 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; -- 2.41.0