Merge git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs

[linux-2.6] / Documentation / networking / 3c509.txt

diff --git a/Documentation/networking/3c509.txt b/Documentation/networking/3c509.txt
index 867a99f88c68459cd92c95a81a85f395e4e97cd6..0643e3b7168cccb44acf65735c71beb5e273845c 100644 (file)
--- a/Documentation/networking/3c509.txt
+++ b/Documentation/networking/3c509.txt
@@ -126,7 +126,7 @@ packets faster than they can be removed from the card. This should be rare
 or impossible in normal operation. Possible causes of this error report are:
  
    - a "green" mode enabled that slows the processor down when there is no
-     keyboard activitiy. 
+     keyboard activity. 
 
    - some other device or device driver hogging the bus or disabling interrupts.
      Check /proc/interrupts for excessive interrupt counts. The timer tick