diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-06 20:00:59 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-06 20:00:59 +0200 |
| commit | 10387e5eb45c6e48d67102b88229f5bc6037461c (patch) | |
| tree | 77b305e7db8aa0b8b451c96f33aed66bf1a8a50f | |
| parent | [PATCH] FRV: Use the generic time stuff for FRV (diff) | |
| parent | [PATCH] myri10ge: update the firmware download URL in Kconfig (diff) | |
| download | linux-10387e5eb45c6e48d67102b88229f5bc6037461c.tar.xz linux-10387e5eb45c6e48d67102b88229f5bc6037461c.zip | |
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
| -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 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 |