aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-09-06 11:00:59 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-06 11:00:59 -0700
commit10387e5eb45c6e48d67102b88229f5bc6037461c (patch)
tree77b305e7db8aa0b8b451c96f33aed66bf1a8a50f /drivers
parentebd6c17109aed086908ae3b0949265fd07712659 (diff)
parentd279490543ee4e7c51371eb605b578ab47f45305 (diff)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: [PATCH] myri10ge: update the firmware download URL in Kconfig
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 30b3671d833..a2bd8119270 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2393,7 +2393,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