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/am79c961a.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/am79c961a.h')
| -rw-r--r-- | drivers/net/arm/am79c961a.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/arm/am79c961a.h b/drivers/net/arm/am79c961a.h index 483009fe6ec2..fd634d32756b 100644 --- a/drivers/net/arm/am79c961a.h +++ b/drivers/net/arm/am79c961a.h | |||
| @@ -130,7 +130,6 @@ | |||
| 130 | #define ISALED0_LNKST 0x8000 | 130 | #define ISALED0_LNKST 0x8000 |
| 131 | 131 | ||
| 132 | struct dev_priv { | 132 | struct dev_priv { |
| 133 | struct net_device_stats stats; | ||
| 134 | unsigned long rxbuffer[RX_BUFFERS]; | 133 | unsigned long rxbuffer[RX_BUFFERS]; |
| 135 | unsigned long txbuffer[TX_BUFFERS]; | 134 | unsigned long txbuffer[TX_BUFFERS]; |
| 136 | unsigned char txhead; | 135 | unsigned char txhead; |