diff options
author | David S. Miller <davem@davemloft.net> | 2008-06-28 08:19:40 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-06-28 08:19:40 (GMT) |
commit | 1b63ba8a86c85524a8d7e5953b314ce71ebcb9c9 (patch) | |
tree | fe3dc41cbb47ae12b7c3faf6a88b097349e50d5a /Documentation | |
parent | e35c3269edba151e1c703d87068a28ce2cd65bb0 (diff) | |
parent | d420895efb259a78dda50f95289571faa6e10e41 (diff) | |
download | linux-1b63ba8a86c85524a8d7e5953b314ce71ebcb9c9.tar.xz |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl4965-base.c
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/networking/s2io.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/networking/s2io.txt b/Documentation/networking/s2io.txt index 4bde53e..1e28e2d 100644 --- a/Documentation/networking/s2io.txt +++ b/Documentation/networking/s2io.txt @@ -83,9 +83,9 @@ Valid range: Limited by memory on system Default: 30 e. intr_type -Specifies interrupt type. Possible values 1(INTA), 2(MSI), 3(MSI-X) -Valid range: 1-3 -Default: 1 +Specifies interrupt type. Possible values 0(INTA), 2(MSI-X) +Valid values: 0, 2 +Default: 2 5. Performance suggestions General: |