Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[linux-beck.git] / drivers / staging / octeon / ethernet.c

diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index 9a2ec251ae4d5fad3e1b33077bfb280afb5806c6..c3a90e7012afaddbfa5c0959d35d088de15ab562 100644 (file)
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -72,7 +72,7 @@ int pow_receive_group = 15;
 module_param(pow_receive_group, int, 0444);
 MODULE_PARM_DESC(pow_receive_group, "\n"
        "\tPOW group to receive packets from. All ethernet hardware\n"
-       "\twill be configured to send incomming packets to this POW\n"
+       "\twill be configured to send incoming packets to this POW\n"
        "\tgroup. Also any other software can submit packets to this\n"
        "\tgroup for the kernel to process.");