# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1414491960 -3600
# Node ID fe5687a0a3222cbb2dd9086998450916c4bd9ea9
# Parent  87e502828b3f855c9bfefa4e6df3673b771cee0e
Fixed wrong version e1000 includes.

diff -r 87e502828b3f -r fe5687a0a322 devices/e1000/e1000-3.6-ethercat.h
--- a/devices/e1000/e1000-3.6-ethercat.h	Mon Oct 27 16:33:23 2014 +0100
+++ b/devices/e1000/e1000-3.6-ethercat.h	Tue Oct 28 11:26:00 2014 +0100
@@ -81,7 +81,7 @@
 
 struct e1000_adapter;
 
-#include "e1000_hw-3.4-ethercat.h"
+#include "e1000_hw-3.6-ethercat.h"
 
 #define E1000_MAX_INTR 10
 
diff -r 87e502828b3f -r fe5687a0a322 devices/e1000/e1000_ethtool-2.6.28-ethercat.c
--- a/devices/e1000/e1000_ethtool-2.6.28-ethercat.c	Mon Oct 27 16:33:23 2014 +0100
+++ b/devices/e1000/e1000_ethtool-2.6.28-ethercat.c	Tue Oct 28 11:26:00 2014 +0100
@@ -28,7 +28,7 @@
 
 /* ethtool support for e1000 */
 
-#include "e1000-2.6.27-ethercat.h"
+#include "e1000-2.6.28-ethercat.h"
 #include <asm/uaccess.h>
 
 struct e1000_stats {
diff -r 87e502828b3f -r fe5687a0a322 devices/e1000/e1000_ethtool-3.6-ethercat.c
--- a/devices/e1000/e1000_ethtool-3.6-ethercat.c	Mon Oct 27 16:33:23 2014 +0100
+++ b/devices/e1000/e1000_ethtool-3.6-ethercat.c	Tue Oct 28 11:26:00 2014 +0100
@@ -28,7 +28,7 @@
 
 /* ethtool support for e1000 */
 
-#include "e1000-3.4-ethercat.h"
+#include "e1000-3.6-ethercat.h"
 #include <asm/uaccess.h>
 
 enum {NETDEV_STATS, E1000_STATS};
diff -r 87e502828b3f -r fe5687a0a322 devices/e1000/e1000_hw-2.6.28-ethercat.c
--- a/devices/e1000/e1000_hw-2.6.28-ethercat.c	Mon Oct 27 16:33:23 2014 +0100
+++ b/devices/e1000/e1000_hw-2.6.28-ethercat.c	Tue Oct 28 11:26:00 2014 +0100
@@ -31,7 +31,7 @@
  */
 
 
-#include "e1000_hw-2.6.27-ethercat.h"
+#include "e1000_hw-2.6.28-ethercat.h"
 
 static s32 e1000_swfw_sync_acquire(struct e1000_hw *hw, u16 mask);
 static void e1000_swfw_sync_release(struct e1000_hw *hw, u16 mask);
diff -r 87e502828b3f -r fe5687a0a322 devices/e1000/e1000_hw-3.6-ethercat.c
--- a/devices/e1000/e1000_hw-3.6-ethercat.c	Mon Oct 27 16:33:23 2014 +0100
+++ b/devices/e1000/e1000_hw-3.6-ethercat.c	Tue Oct 28 11:26:00 2014 +0100
@@ -30,7 +30,7 @@
  * Shared functions for accessing and configuring the MAC
  */
 
-#include "e1000-3.4-ethercat.h"
+#include "e1000-3.6-ethercat.h"
 
 static s32 e1000_check_downshift(struct e1000_hw *hw);
 static s32 e1000_check_polarity(struct e1000_hw *hw,
diff -r 87e502828b3f -r fe5687a0a322 devices/e1000/e1000_hw-3.6-ethercat.h
--- a/devices/e1000/e1000_hw-3.6-ethercat.h	Mon Oct 27 16:33:23 2014 +0100
+++ b/devices/e1000/e1000_hw-3.6-ethercat.h	Tue Oct 28 11:26:00 2014 +0100
@@ -33,7 +33,7 @@
 #ifndef _E1000_HW_H_
 #define _E1000_HW_H_
 
-#include "e1000_osdep-3.4-ethercat.h"
+#include "e1000_osdep-3.6-ethercat.h"
 
 
 /* Forward declarations of structures used by the shared code */
diff -r 87e502828b3f -r fe5687a0a322 devices/e1000/e1000_main-2.6.28-ethercat.c
--- a/devices/e1000/e1000_main-2.6.28-ethercat.c	Mon Oct 27 16:33:23 2014 +0100
+++ b/devices/e1000/e1000_main-2.6.28-ethercat.c	Tue Oct 28 11:26:00 2014 +0100
@@ -28,7 +28,7 @@
 
 *******************************************************************************/
 
-#include "e1000-2.6.27-ethercat.h"
+#include "e1000-2.6.28-ethercat.h"
 #include <net/ip6_checksum.h>
 
 char e1000_driver_name[] = "ec_e1000";
diff -r 87e502828b3f -r fe5687a0a322 devices/e1000/e1000_main-3.6-ethercat.c
--- a/devices/e1000/e1000_main-3.6-ethercat.c	Mon Oct 27 16:33:23 2014 +0100
+++ b/devices/e1000/e1000_main-3.6-ethercat.c	Tue Oct 28 11:26:00 2014 +0100
@@ -28,7 +28,7 @@
 
 *******************************************************************************/
 
-#include "e1000-3.4-ethercat.h"
+#include "e1000-3.6-ethercat.h"
 #include <net/ip6_checksum.h>
 #include <linux/io.h>
 #include <linux/prefetch.h>
diff -r 87e502828b3f -r fe5687a0a322 devices/e1000/e1000_param-2.6.27-orig.c
--- a/devices/e1000/e1000_param-2.6.27-orig.c	Mon Oct 27 16:33:23 2014 +0100
+++ b/devices/e1000/e1000_param-2.6.27-orig.c	Tue Oct 28 11:26:00 2014 +0100
@@ -26,7 +26,7 @@
 
 *******************************************************************************/
 
-#include "e1000-2.6.27-ethercat.h"
+#include "e1000.h"
 
 /* This is the only thing that needs to be changed to adjust the
  * maximum number of ports that the driver can manage.
diff -r 87e502828b3f -r fe5687a0a322 devices/e1000/e1000_param-3.6-ethercat.c
--- a/devices/e1000/e1000_param-3.6-ethercat.c	Mon Oct 27 16:33:23 2014 +0100
+++ b/devices/e1000/e1000_param-3.6-ethercat.c	Tue Oct 28 11:26:00 2014 +0100
@@ -26,7 +26,7 @@
 
 *******************************************************************************/
 
-#include "e1000-3.4-ethercat.h"
+#include "e1000-3.6-ethercat.h"
 
 /* This is the only thing that needs to be changed to adjust the
  * maximum number of ports that the driver can manage.