@@ -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