Fixed wrong version e1000 includes.
This commit is contained in:
parent
7cb12f0cb8
commit
4ca7ebce7a
|
|
@ -81,7 +81,7 @@
|
||||||
|
|
||||||
struct e1000_adapter;
|
struct e1000_adapter;
|
||||||
|
|
||||||
#include "e1000_hw-3.4-ethercat.h"
|
#include "e1000_hw-3.6-ethercat.h"
|
||||||
|
|
||||||
#define E1000_MAX_INTR 10
|
#define E1000_MAX_INTR 10
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
|
|
||||||
/* ethtool support for e1000 */
|
/* ethtool support for e1000 */
|
||||||
|
|
||||||
#include "e1000-2.6.27-ethercat.h"
|
#include "e1000-2.6.28-ethercat.h"
|
||||||
#include <asm/uaccess.h>
|
#include <asm/uaccess.h>
|
||||||
|
|
||||||
struct e1000_stats {
|
struct e1000_stats {
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
|
|
||||||
/* ethtool support for e1000 */
|
/* ethtool support for e1000 */
|
||||||
|
|
||||||
#include "e1000-3.4-ethercat.h"
|
#include "e1000-3.6-ethercat.h"
|
||||||
#include <asm/uaccess.h>
|
#include <asm/uaccess.h>
|
||||||
|
|
||||||
enum {NETDEV_STATS, E1000_STATS};
|
enum {NETDEV_STATS, E1000_STATS};
|
||||||
|
|
|
||||||
|
|
@ -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 s32 e1000_swfw_sync_acquire(struct e1000_hw *hw, u16 mask);
|
||||||
static void e1000_swfw_sync_release(struct e1000_hw *hw, u16 mask);
|
static void e1000_swfw_sync_release(struct e1000_hw *hw, u16 mask);
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@
|
||||||
* Shared functions for accessing and configuring the MAC
|
* 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_downshift(struct e1000_hw *hw);
|
||||||
static s32 e1000_check_polarity(struct e1000_hw *hw,
|
static s32 e1000_check_polarity(struct e1000_hw *hw,
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@
|
||||||
#ifndef _E1000_HW_H_
|
#ifndef _E1000_HW_H_
|
||||||
#define _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 */
|
/* Forward declarations of structures used by the shared code */
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
|
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
|
|
||||||
#include "e1000-2.6.27-ethercat.h"
|
#include "e1000-2.6.28-ethercat.h"
|
||||||
#include <net/ip6_checksum.h>
|
#include <net/ip6_checksum.h>
|
||||||
|
|
||||||
char e1000_driver_name[] = "ec_e1000";
|
char e1000_driver_name[] = "ec_e1000";
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
|
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
|
|
||||||
#include "e1000-3.4-ethercat.h"
|
#include "e1000-3.6-ethercat.h"
|
||||||
#include <net/ip6_checksum.h>
|
#include <net/ip6_checksum.h>
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
#include <linux/prefetch.h>
|
#include <linux/prefetch.h>
|
||||||
|
|
|
||||||
|
|
@ -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
|
/* This is the only thing that needs to be changed to adjust the
|
||||||
* maximum number of ports that the driver can manage.
|
* maximum number of ports that the driver can manage.
|
||||||
|
|
|
||||||
|
|
@ -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
|
/* This is the only thing that needs to be changed to adjust the
|
||||||
* maximum number of ports that the driver can manage.
|
* maximum number of ports that the driver can manage.
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue