Merge 3.4-rc5 into staging-next

[firefly-linux-kernel-4.4.55.git] / drivers / staging / octeon / ethernet-rx.c

diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
index 5699e6f1b5ba58021a6596a614418f6d72be985e..34afc16bc4935e35f5e47c12d27925f6fe7c62f3 100644 (file)
--- a/drivers/staging/octeon/ethernet-rx.c
+++ b/drivers/staging/octeon/ethernet-rx.c
@@ -36,6 +36,7 @@
 #include <linux/prefetch.h>
 #include <linux/ratelimit.h>
 #include <linux/smp.h>
+#include <linux/interrupt.h>
 #include <net/dst.h>
 #ifdef CONFIG_XFRM
 #include <linux/xfrm.h>