summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-06 11:06:44 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-06 11:06:44 -0400
commitb4d01327e4c05ab555a4cf38a33f4b4fa2f75e64 (patch)
treef683950f737fea82e55153209ef34a4089285abc
parenta2413598b8c5f14d75f914ce95d72bacdeabd05e (diff)
parentd279490543ee4e7c51371eb605b578ab47f45305 (diff)
downloadlinux-3.10-b4d01327e4c05ab555a4cf38a33f4b4fa2f75e64.tar.gz
linux-3.10-b4d01327e4c05ab555a4cf38a33f4b4fa2f75e64.tar.bz2
linux-3.10-b4d01327e4c05ab555a4cf38a33f4b4fa2f75e64.zip
Merge branch 'upstream-fixes' into upstream
-rw-r--r--drivers/net/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 6f388d9e9be..de4f9e1f2ca 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2418,7 +2418,7 @@ config MYRI10GE
you will need a newer firmware image.
You may get this image or more information, at:
- <http://www.myri.com/Myri-10G/>
+ <http://www.myri.com/scs/download-Myri10GE.html>
To compile this driver as a module, choose M here and read
<file:Documentation/networking/net-modules.txt>. The module