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/ether3.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/ether3.h')
| -rw-r--r-- | drivers/net/arm/ether3.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/arm/ether3.h b/drivers/net/arm/ether3.h index 1921a3a07da7..2db63b08bdf3 100644 --- a/drivers/net/arm/ether3.h +++ b/drivers/net/arm/ether3.h | |||
| @@ -164,7 +164,6 @@ struct dev_priv { | |||
| 164 | unsigned char tx_head; /* buffer nr to insert next packet */ | 164 | unsigned char tx_head; /* buffer nr to insert next packet */ |
| 165 | unsigned char tx_tail; /* buffer nr of transmitting packet */ | 165 | unsigned char tx_tail; /* buffer nr of transmitting packet */ |
| 166 | unsigned int rx_head; /* address to fetch next packet from */ | 166 | unsigned int rx_head; /* address to fetch next packet from */ |
| 167 | struct net_device_stats stats; | ||
| 168 | struct timer_list timer; | 167 | struct timer_list timer; |
| 169 | int broken; /* 0 = ok, 1 = something went wrong */ | 168 | int broken; /* 0 = ok, 1 = something went wrong */ |
| 170 | }; | 169 | }; |