From a82de7ea52e74b39b9e13ec0d6372378181dcfd0 Mon Sep 17 00:00:00 2001 From: Oleg Drokin <green@linuxhacker.ru> Date: Wed, 24 Jun 2015 10:07:45 -0400 Subject: [PATCH] staging/lustre/lnet: Move asm/irq.h include after linux includes Apparently m86k cannot build if you include asm/irq.h before linux/* includes and fixing it there is hard. So just move asm/irq.h include to where it does not cause any problems. Thanks to Geert Uytterhoeven for getting to the root of it. Signed-off-by: Oleg Drokin <green@linuxhacker.ru> Compile-Tested-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h index 7125eb955ae50..cb91e68919d0f 100644 --- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h +++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h @@ -31,7 +31,6 @@ #define DEBUG_PORTAL_ALLOC #define DEBUG_SUBSYSTEM S_LND -#include <asm/irq.h> #include <linux/crc32.h> #include <linux/errno.h> #include <linux/if.h> @@ -47,6 +46,7 @@ #include <linux/sysctl.h> #include <linux/uio.h> #include <linux/unistd.h> +#include <asm/irq.h> #include <net/sock.h> #include <net/tcp.h> -- 2.30.2