diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/net/ucc_geth.h | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'drivers/net/ucc_geth.h')
| -rw-r--r-- | drivers/net/ucc_geth.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ucc_geth.h b/drivers/net/ucc_geth.h index 055b87ab4f07..d12fcad145e9 100644 --- a/drivers/net/ucc_geth.h +++ b/drivers/net/ucc_geth.h | |||
| @@ -80,7 +80,7 @@ struct ucc_geth { | |||
| 80 | frames) received that were between 128 | 80 | frames) received that were between 128 |
| 81 | (Including FCS length==4) and 255 octets */ | 81 | (Including FCS length==4) and 255 octets */ |
| 82 | u32 txok; /* Total number of octets residing in frames | 82 | u32 txok; /* Total number of octets residing in frames |
| 83 | that where involved in successfull | 83 | that where involved in successful |
| 84 | transmission */ | 84 | transmission */ |
| 85 | u16 txcf; /* Total number of PAUSE control frames | 85 | u16 txcf; /* Total number of PAUSE control frames |
| 86 | transmitted by this MAC */ | 86 | transmitted by this MAC */ |
| @@ -759,7 +759,7 @@ struct ucc_geth_hardware_statistics { | |||
| 759 | frames) received that were between 128 | 759 | frames) received that were between 128 |
| 760 | (Including FCS length==4) and 255 octets */ | 760 | (Including FCS length==4) and 255 octets */ |
| 761 | u32 txok; /* Total number of octets residing in frames | 761 | u32 txok; /* Total number of octets residing in frames |
| 762 | that where involved in successfull | 762 | that where involved in successful |
| 763 | transmission */ | 763 | transmission */ |
| 764 | u16 txcf; /* Total number of PAUSE control frames | 764 | u16 txcf; /* Total number of PAUSE control frames |
| 765 | transmitted by this MAC */ | 765 | transmitted by this MAC */ |