[PATCH 3/6] e1000 driver remove checkpatch errors, warnings and checks.
From: Janusz Wolak <hidden>
Date: 2015-10-13 21:48:23
Also in:
intel-wired-lan, lkml
Subsystem:
intel ethernet drivers, networking drivers, the rest · Maintainers:
Tony Nguyen, Przemek Kitszel, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
From: Janusz Wolak <redacted> Signed-off-by: Janusz Wolak <redacted> --- drivers/net/ethernet/intel/e1000/e1000.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000/e1000.h b/drivers/net/ethernet/intel/e1000/e1000.h
index 6970710..ec82b2d 100644
--- a/drivers/net/ethernet/intel/e1000/e1000.h
+++ b/drivers/net/ethernet/intel/e1000/e1000.h@@ -1,5 +1,5 @@ /******************************************************************************* - +* Intel PRO/1000 Linux driver Copyright(c) 1999 - 2006 Intel Corporation.
@@ -26,7 +26,6 @@ *******************************************************************************/ - /* Linux PRO/1000 Ethernet Driver main header file */ #ifndef _E1000_H_
@@ -53,7 +52,7 @@ #include <linux/pagemap.h> #include <linux/dma-mapping.h> #include <linux/bitops.h> -#include <asm/io.h> +#include <linux/io.h> #include <asm/irq.h> #include <linux/capability.h> #include <linux/in.h>
@@ -82,8 +81,7 @@ struct e1000_adapter; #define E1000_MAX_INTR 10 -/* - * Count for polling __E1000_RESET condition every 10-20msec. +/* Count for polling __E1000_RESET condition every 10-20msec. */ #define E1000_CHECK_RESET_COUNT 50
--
1.9.1