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

[~andy/linux] / drivers / firewire / ohci.c

diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index f25610bb31489a2ded669112c2b2915f826c4de6..6ce6e07c38c1b3ba038ee816e26225e8b5f9ee4a 100644 (file)
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -1281,7 +1281,7 @@ static int at_context_queue_packet(struct context *ctx,
        d[0].res_count = cpu_to_le16(packet->timestamp);
 
        /*
-        * The DMA format for asyncronous link packets is different
+        * The DMA format for asynchronous link packets is different
         * from the IEEE1394 layout, so shift the fields around
         * accordingly.
         */