diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-25 19:20:38 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-25 19:20:38 -0800 |
| commit | 041110a439e21cd40709ead4ffbfa8034619ad77 (patch) | |
| tree | 4d9f792625a61fa26bc5085f0bfab6208f1ff0ec /Documentation/networking/e1000.txt | |
| parent | a1a5da57d0884017b8c3a011a28d4f5e08a2ea4f (diff) | |
| parent | 2316aa2aee254c126e688b53a3a105b82bc3f368 (diff) | |
| download | blackbird-op-linux-041110a439e21cd40709ead4ffbfa8034619ad77.tar.gz blackbird-op-linux-041110a439e21cd40709ead4ffbfa8034619ad77.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
Diffstat (limited to 'Documentation/networking/e1000.txt')
| -rw-r--r-- | Documentation/networking/e1000.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/networking/e1000.txt b/Documentation/networking/e1000.txt index 6cb13e9e1346..71ca95855671 100644 --- a/Documentation/networking/e1000.txt +++ b/Documentation/networking/e1000.txt @@ -431,15 +431,15 @@ Additional Configurations Ethtool ------- The driver utilizes the ethtool interface for driver configuration and - diagnostics, as well as displaying statistical information. Ethtool + diagnostics, as well as displaying statistical information. The ethtool version 1.6 or later is required for this functionality. The latest release of ethtool can be found from - http://sourceforge.net/projects/gkernel. + http://ftp.kernel.org/pub/software/network/ethtool/ Enabling Wake on LAN* (WoL) --------------------------- - WoL is configured through the Ethtool* utility. + WoL is configured through the ethtool* utility. WoL will be enabled on the system during the next shut down or reboot. For this driver version, in order to enable WoL, the e1000 driver must be |
