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/arm/ether1.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/arm/ether1.h')
| -rw-r--r-- | drivers/net/arm/ether1.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/arm/ether1.h b/drivers/net/arm/ether1.h index c8a4b2389d85..3a5830ab3dc7 100644 --- a/drivers/net/arm/ether1.h +++ b/drivers/net/arm/ether1.h | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | 38 | ||
| 39 | struct ether1_priv { | 39 | struct ether1_priv { |
| 40 | void __iomem *base; | 40 | void __iomem *base; |
| 41 | struct net_device_stats stats; | ||
| 42 | unsigned int tx_link; | 41 | unsigned int tx_link; |
| 43 | unsigned int tx_head; | 42 | unsigned int tx_head; |
| 44 | volatile unsigned int tx_tail; | 43 | volatile unsigned int tx_tail; |