Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / net / dsa / mv88e6131.c

diff --git a/net/dsa/mv88e6131.c b/net/dsa/mv88e6131.c
index a8e4f8c..3da4188 100644 (file)
--- a/net/dsa/mv88e6131.c
+++ b/net/dsa/mv88e6131.c
@@ -133,7 +133,7 @@ static int mv88e6131_setup_global(struct dsa_switch *ds)
         * Ignore removed tag data on doubly tagged packets, disable
         * flow control messages, force flow control priority to the
         * highest, and send all special multicast frames to the CPU
-        * port at the higest priority.
+        * port at the highest priority.
         */
        REG_WRITE(REG_GLOBAL2, 0x05, 0x00ff);