Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[platform/kernel/linux-rpi.git] / arch / mips / include / asm / octeon / cvmx-helper-util.h

diff --git a/arch/mips/include/asm/octeon/cvmx-helper-util.h b/arch/mips/include/asm/octeon/cvmx-helper-util.h
index e217aba..f446f21 100644 (file)
--- a/arch/mips/include/asm/octeon/cvmx-helper-util.h
+++ b/arch/mips/include/asm/octeon/cvmx-helper-util.h
@@ -60,7 +60,7 @@ extern int cvmx_helper_dump_packet(cvmx_wqe_t *work);
  *              Packets will begin slowly dropping when there are less than
  *              this many packet buffers free in FPA 0.
  * @drop_thresh:
- *              All incomming packets will be dropped when there are less
+ *              All incoming packets will be dropped when there are less
  *              than this many free packet buffers in FPA 0.
  * Returns Zero on success. Negative on failure
  */
@@ -74,7 +74,7 @@ extern int cvmx_helper_setup_red_queue(int queue, int pass_thresh,
  *              Packets will begin slowly dropping when there are less than
  *              this many packet buffers free in FPA 0.
  * @drop_thresh:
- *              All incomming packets will be dropped when there are less
+ *              All incoming packets will be dropped when there are less
  *              than this many free packet buffers in FPA 0.
  * Returns Zero on success. Negative on failure
  */