diff options
| author | J. German Rivera <Jose.G.Rivera@freescale.com> | 2013-09-07 18:15:43 (GMT) |
|---|---|---|
| committer | J. German Rivera <German.Rivera@freescale.com> | 2013-09-07 18:15:43 (GMT) |
| commit | 78f1554f2ac9a8a3dd622fa49f4623cddba9e036 (patch) | |
| tree | b488208f99a90f1966ba8d7803cd5ddcc287a1fa /include | |
| parent | 188c08c4064ffc2fa303b8512a673016d1d4071c (diff) | |
| parent | db651a6e8e0df939cb977a8799816c04b07506c3 (diff) | |
| download | linux-fsl-qoriq-78f1554f2ac9a8a3dd622fa49f4623cddba9e036.tar.xz | |
Merge branch 'sdk-v1.4.x' into sdk-kernel-3.8
Conflicts temporarily resolved for:
drivers/net/ethernet/freescale/dpa/dpaa_eth.c
Permanent solution needs to be provided by the author of
commit ec6aa025.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fsl_dpa_stats.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/fsl_dpa_stats.h b/include/linux/fsl_dpa_stats.h index 048efd8..a411e66 100644 --- a/include/linux/fsl_dpa_stats.h +++ b/include/linux/fsl_dpa_stats.h @@ -469,7 +469,7 @@ struct dpa_stats_cnt_traffic_mng { enum dpa_stats_cnt_traffic_mng_src src; /* - * Depending on the Traffic Manager source, the 'traffic_obj' has a + * Depending on the Traffic Manager source, the 'traffic_mng' has a * different meaning: it represents a pointer to a structure of type * 'qm_ceetm_cq' in case the traffic source is a "Class Queue" or a * pointer to a structure of type 'qm_ceetm_ccg' in case the traffic @@ -690,7 +690,7 @@ struct dpa_stats_cls_cnt_traffic_mng { enum dpa_stats_cnt_traffic_mng_src src; /* - * Depending on the Traffic Manager source, the 'traffic_obj' has a + * Depending on the Traffic Manager source, the 'traffic_mng' has a * different meaning: it represents an array of pointers to structures * of type 'qm_ceetm_cq' in case the traffic source is a "Class Queue" * or an array of pointers to structures of type 'qm_ceetm_ccg' in case |