diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 12:39:56 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 12:40:01 +0000 |
| commit | 4d8cfec692e988b844dcaeaeb76b5780b7ef9d28 (patch) | |
| tree | 67d43adab2afd18a74d08f347e3676ae1a64193f /drivers/net/ethernet/stmicro/stmmac/common.h | |
| parent | a3a3c4664184f86ef964323d106c62158e2b3f25 (diff) | |
| parent | 1d8c38c3d1b48eeb9cfaa42a8be13a1423569eb2 (diff) | |
| download | linux-4d8cfec692e988b844dcaeaeb76b5780b7ef9d28.tar.gz linux-4d8cfec692e988b844dcaeaeb76b5780b7ef9d28.tar.bz2 linux-4d8cfec692e988b844dcaeaeb76b5780b7ef9d28.zip | |
Merge branch 'cleanup-3.4' of git://github.com/hzhuang1/linux into next/cleanup
* 'cleanup-3.4' of git://github.com/hzhuang1/linux: (2 commits)
rtc: sa1100: remove verification code of alarm
rtc: sa1100: remove periodic code
(update to v3.3-rc5)
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/common.h')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h index d0b814ef0675..0319d640f728 100644 --- a/drivers/net/ethernet/stmicro/stmmac/common.h +++ b/drivers/net/ethernet/stmicro/stmmac/common.h @@ -67,6 +67,7 @@ struct stmmac_extra_stats { unsigned long ipc_csum_error; unsigned long rx_collision; unsigned long rx_crc; + unsigned long dribbling_bit; unsigned long rx_length; unsigned long rx_mii; unsigned long rx_multicast; |