]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
r8169: don't include asm headers directly
authorHeiner Kallweit <hkallweit1@gmail.com>
Fri, 10 Aug 2018 20:37:31 +0000 (22:37 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 10 Aug 2018 21:32:35 +0000 (14:32 -0700)
The asm headers shouldn't be included directly. asm/irq.h is
implicitly included by linux/interrupt.h, and instead of
asm/io.h include linux/io.h.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/realtek/r8169.c

index 77802a9d162e5e93b5fe3d12c190e794dc9e3737..7f0975b61c53d9d2ef9ab47ec0c062fe35142f0a 100644 (file)
@@ -19,6 +19,7 @@
 #include <linux/if_vlan.h>
 #include <linux/crc32.h>
 #include <linux/in.h>
+#include <linux/io.h>
 #include <linux/ip.h>
 #include <linux/tcp.h>
 #include <linux/interrupt.h>
@@ -29,9 +30,6 @@
 #include <linux/ipv6.h>
 #include <net/ip6_checksum.h>
 
-#include <asm/io.h>
-#include <asm/irq.h>
-
 #define MODULENAME "r8169"
 
 #define FIRMWARE_8168D_1       "rtl_nic/rtl8168d-1.fw"