diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-12 12:03:21 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 12:03:21 -0400 |
commit | 97148ba2235e334e57d05fa07045cf3e6629763c (patch) | |
tree | a04504e7d4feb0dacfe1862a59abecaf99997f09 /drivers/net/Kconfig | |
parent | 76ff3c6e3b389a5a7692811dd456e0ff58340cac (diff) | |
parent | 05ff0e291af086f4325bac76abad250690bbbd63 (diff) |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r-- | drivers/net/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 30b3671d833d..a2bd8119270e 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -2393,7 +2393,7 @@ config MYRI10GE | |||
2393 | you will need a newer firmware image. | 2393 | you will need a newer firmware image. |
2394 | You may get this image or more information, at: | 2394 | You may get this image or more information, at: |
2395 | 2395 | ||
2396 | <http://www.myri.com/Myri-10G/> | 2396 | <http://www.myri.com/scs/download-Myri10GE.html> |
2397 | 2397 | ||
2398 | To compile this driver as a module, choose M here and read | 2398 | To compile this driver as a module, choose M here and read |
2399 | <file:Documentation/networking/net-modules.txt>. The module | 2399 | <file:Documentation/networking/net-modules.txt>. The module |