2014-04-02 15:25:51

by Josh Boyer

Subject: [PATCH] net: qlcnic: include irq.h for irq definitions

The qlcnic driver fails to build on ARM with errors like:

In file included from drivers/net/ethernet/qlogic/qlcnic/qlcnic.h:36:0,
from drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c:8:
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h:585:1: error: unknown type name 'irqreturn_t'
irqreturn_t qlcnic_83xx_clear_legacy_intr(struct qlcnic_adapter *);
^

Nothing in the driver is explicitly including the irq definitions, so we
add an include of linux/irq.h to pick them up.

Signed-off-by: Josh Boyer <[email protected]>
---
drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
index f19f81cde134..cbc897e6bb8f 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
@@ -23,6 +23,7 @@
#include <linux/ethtool.h>
#include <linux/mii.h>
#include <linux/timer.h>
+#include <linux/irq.h>

#include <linux/vmalloc.h>

--
1.8.5.3

2014-04-03 18:03:46

by David Miller

Subject: Re: [PATCH] net: qlcnic: include irq.h for irq definitions

From: Josh Boyer <[email protected]>
Date: Wed, 2 Apr 2014 11:25:47 -0400

> The qlcnic driver fails to build on ARM with errors like:
>
> In file included from drivers/net/ethernet/qlogic/qlcnic/qlcnic.h:36:0,
> from drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c:8:
> drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h:585:1: error: unknown type name 'irqreturn_t'
> irqreturn_t qlcnic_83xx_clear_legacy_intr(struct qlcnic_adapter *);
> ^
>
> Nothing in the driver is explicitly including the irq definitions, so we
> add an include of linux/irq.h to pick them up.
>
> Signed-off-by: Josh Boyer <[email protected]>

Applied, thanks Josh.