diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-10 07:22:40 +0100 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-10 07:22:40 +0100 |
commit | 5d43889c07bb38694742936aa70d1187c012e198 (patch) | |
tree | 73809dddae39ae3b746396e9779142dbd1973f33 /Documentation/networking/vortex.txt | |
parent | Input: ALPS - add support for DualPoint device on Dell XT2 model (diff) | |
parent | Linux 3.13-rc3 (diff) | |
download | linux-5d43889c07bb38694742936aa70d1187c012e198.tar.xz linux-5d43889c07bb38694742936aa70d1187c012e198.zip |
Merge tag 'v3.13-rc3' into for-linus
Merging with the mainline to sync up on changes to serio core.
Diffstat (limited to 'Documentation/networking/vortex.txt')
-rw-r--r-- | Documentation/networking/vortex.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/networking/vortex.txt b/Documentation/networking/vortex.txt index 9a8041dcbb53..97282da82b75 100644 --- a/Documentation/networking/vortex.txt +++ b/Documentation/networking/vortex.txt @@ -68,7 +68,7 @@ Module parameters There are several parameters which may be provided to the driver when its module is loaded. These are usually placed in /etc/modprobe.d/*.conf -configuretion files. Example: +configuration files. Example: options 3c59x debug=3 rx_copybreak=300 @@ -178,7 +178,7 @@ max_interrupt_work=N The driver's interrupt service routine can handle many receive and transmit packets in a single invocation. It does this in a loop. - The value of max_interrupt_work governs how mnay times the interrupt + The value of max_interrupt_work governs how many times the interrupt service routine will loop. The default value is 32 loops. If this is exceeded the interrupt service routine gives up and generates a warning message "eth0: Too much work in interrupt". |