Commit a2da41af authored by Jeff Garzik's avatar Jeff Garzik

Merge redhat.com:/garz/repo/linus-2.5

into redhat.com:/garz/repo/net-drivers-2.5
parents e00b99de 3fc8b2b4
...@@ -322,7 +322,7 @@ int __init proteon_probe(struct net_device *dev) ...@@ -322,7 +322,7 @@ int __init proteon_probe(struct net_device *dev)
* Calling this on a board that does not support it can be a very * Calling this on a board that does not support it can be a very
* dangerous thing. The Madge board, for instance, will lock your * dangerous thing. The Madge board, for instance, will lock your
* machine hard when this is called. Luckily, its supported in a * machine hard when this is called. Luckily, its supported in a
* seperate driver. --ASF * separate driver. --ASF
*/ */
static void proteon_read_eeprom(struct net_device *dev) static void proteon_read_eeprom(struct net_device *dev)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment