From: Andrzej Zaborowski <balrog@zabor.org>
Date: Tue, 9 Jan 2007 23:31:18 +0000 (-0800)
Subject: Make omap-ir build with workqueue changes
X-Git-Tag: v2.6.21-omap1~170
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8e393bfd48d7ab5a86a9631114678aa5e3e4c5e2;p=linux-2.6-omap-h63xx.git

Make omap-ir build with workqueue changes

Make omap-ir build with workqueue changes

Signed-off-by: Andrzej Zaborowski <balrog@zabor.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/net/irda/omap-ir.c b/drivers/net/irda/omap-ir.c
index 562c8768a0b..85658dcddd8 100644
--- a/drivers/net/irda/omap-ir.c
+++ b/drivers/net/irda/omap-ir.c
@@ -54,6 +54,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
+#include <linux/workqueue.h>
 
 #include <net/irda/irda.h>
 #include <net/irda/irmod.h>
@@ -849,7 +850,7 @@ static int omap_irda_probe(struct platform_device *pdev)
 
 	/* Any better way to avoid this? No. */
 	if (machine_is_omap_h3() || machine_is_omap_h4())
-		INIT_WORK(&omap_ir->pdata->gpio_expa, NULL, NULL);
+		INIT_DELAYED_WORK(&omap_ir->pdata->gpio_expa, NULL);
 
 	err = register_netdev(dev);
 	if (!err)