Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd

[linux-2.6-block.git] / drivers / net / s2io.c

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index a9a5f5ed19c640a7518b0a7cb72832718485a785..df0d2c8ecc09dd60cb32c19cd562cddb8951705c 100644 (file)
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -7163,7 +7163,7 @@ static void do_s2io_card_down(struct s2io_nic *sp, int do_io)
                /* As per the HW requirement we need to replenish the
                 * receive buffer to avoid the ring bump. Since there is
                 * no intention of processing the Rx frame at this pointwe are
-                * just settting the ownership bit of rxd in Each Rx
+                * just setting the ownership bit of rxd in Each Rx
                 * ring to HW and set the appropriate buffer size
                 * based on the ring mode
                 */