diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/amd8111e.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/amd8111e.h')
| -rw-r--r-- | drivers/net/amd8111e.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/amd8111e.h b/drivers/net/amd8111e.h index ac36eb6981e3..b5926af03a7e 100644 --- a/drivers/net/amd8111e.h +++ b/drivers/net/amd8111e.h | |||
| @@ -787,7 +787,6 @@ struct amd8111e_priv{ | |||
| 787 | struct vlan_group *vlgrp; | 787 | struct vlan_group *vlgrp; |
| 788 | #endif | 788 | #endif |
| 789 | char opened; | 789 | char opened; |
| 790 | struct net_device_stats stats; | ||
| 791 | unsigned int drv_rx_errors; | 790 | unsigned int drv_rx_errors; |
| 792 | struct amd8111e_coalesce_conf coal_conf; | 791 | struct amd8111e_coalesce_conf coal_conf; |
| 793 | 792 | ||