Merge branch 'master' into for-next

[mv-sheeva.git] / drivers / net / e1000 / e1000_main.c

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 4d62f7bfa0367578471f2773f04a365fed7db972..e02c5d17af0764d04a925a4e32b69ec0ecfadc8c 100644 (file)
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2198,7 +2198,7 @@ static void e1000_set_rx_mode(struct net_device *netdev)
         * addresses take precedence to avoid disabling unicast filtering
         * when possible.
         *
-        * RAR 0 is used for the station MAC adddress
+        * RAR 0 is used for the station MAC address
         * if there are not 14 addresses, go ahead and clear the filters
         */
        i = 1;