diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-28 22:44:58 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-28 22:44:58 -0400 |
| commit | 98846b5e2363e96a2b821e211bf0169afb38a54a (patch) | |
| tree | 7548a8de8c96e089a8e2687ecbe07c58c5ea8371 /drivers/net/s2io.c | |
| parent | e8e16b706e8406f1ab3bccab16932ebc513896d8 (diff) | |
| parent | bd6ca6375b9f18f40e814f391d9d1abaa916bc72 (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/s2io.c')
| -rw-r--r-- | drivers/net/s2io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 3c915b82e199..c082cf0b1ac6 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
| @@ -84,7 +84,7 @@ | |||
| 84 | #include "s2io.h" | 84 | #include "s2io.h" |
| 85 | #include "s2io-regs.h" | 85 | #include "s2io-regs.h" |
| 86 | 86 | ||
| 87 | #define DRV_VERSION "2.0.26.15-2" | 87 | #define DRV_VERSION "2.0.26.20" |
| 88 | 88 | ||
| 89 | /* S2io Driver name & version. */ | 89 | /* S2io Driver name & version. */ |
| 90 | static char s2io_driver_name[] = "Neterion"; | 90 | static char s2io_driver_name[] = "Neterion"; |