Re: OMAP: small patch fixes "error: field 'gpio_expa' has incomplete type"

[Dirk Behme <dirk.behme@googlemail.com>]

[-- Attachment #1: Type: text/plain, Size: 755 bytes --]

Ragner N Magalhães wrote:
> In file included from arch/arm/mach-omap1/board-h2.c:40:
> include/asm/arch/irda.h:27: error: field 'gpio_expa' has incomplete type
...
> --- 2.6-dev.orig/include/asm/arch/irda.h	2006-12-27 10:28:09.000000000 -0400
> +++ 2.6-dev/include/asm/arch/irda.h	2006-12-27 10:29:07.000000000 -0400
> @@ -10,6 +10,8 @@
>  #ifndef ASMARM_ARCH_IRDA_H
>  #define ASMARM_ARCH_IRDA_H
>  
> +#include <linux/workqueue.h>
> +
>  /* board specific transceiver capabilities */

Can you test patch in attachment?

I think the issue is in drivers/net/irda/omap-ir.c. So I 
think touching global irda.h isn't a good idea.

With this patch, drivers/net/irda/omap-ir.c and 
arch/arm/mach-omap1/board-h2.c compiles for me.

Dirk

[-- Attachment #2: irda_workqueue_patch.txt --]
[-- Type: text/plain, Size: 809 bytes --]


Make drivers/net/irda/omap-ir.c compile again.

Signed-off-by: Dirk Behme <dirk.behme_at_gmail.com>
Index: linux-osk/drivers/net/irda/omap-ir.c
===================================================================
--- linux-osk.orig/drivers/net/irda/omap-ir.c
+++ linux-osk/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 platfo
 
 	/* 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_WORK(&(omap_ir->pdata->gpio_expa.work), NULL);
 
 	err = register_netdev(dev);
 	if (!err)

[-- Attachment #3: Type: text/plain, Size: 0 bytes --]