diff options
-rw-r--r-- | MAINTAINERS | 13 | ||||
-rw-r--r-- | drivers/net/s2io.c | 3 |
2 files changed, 14 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8c491321f8e6..d4743b4c3f4f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2512,6 +2512,19 @@ M: adaplas@gmail.com | |||
2512 | L: linux-fbdev-devel@lists.sourceforge.net (subscribers-only) | 2512 | L: linux-fbdev-devel@lists.sourceforge.net (subscribers-only) |
2513 | S: Maintained | 2513 | S: Maintained |
2514 | 2514 | ||
2515 | NETERION (S2IO) Xframe 10GbE DRIVER | ||
2516 | P: Ramkrishna Vepa | ||
2517 | M: ram.vepa@neterion.com | ||
2518 | P: Rastapur Santosh | ||
2519 | M: santosh.rastapur@neterion.com | ||
2520 | P: Sivakumar Subramani | ||
2521 | M: sivakumar.subramani@neterion.com | ||
2522 | P: Sreenivasa Honnur | ||
2523 | M: sreenivasa.honnur@neterion.com | ||
2524 | L: netdev@vger.kernel.org | ||
2525 | W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/TitleIndex?anonymous | ||
2526 | S: Supported | ||
2527 | |||
2515 | OPENCORES I2C BUS DRIVER | 2528 | OPENCORES I2C BUS DRIVER |
2516 | P: Peter Korsgaard | 2529 | P: Peter Korsgaard |
2517 | M: jacmet@sunsite.dk | 2530 | M: jacmet@sunsite.dk |
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 983f38313d87..290e1c1f30c6 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.19.1" | 87 | #define DRV_VERSION "2.0.22.1" |
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"; |
@@ -394,7 +394,6 @@ static const u64 fix_mac[] = { | |||
394 | END_SIGN | 394 | END_SIGN |
395 | }; | 395 | }; |
396 | 396 | ||
397 | MODULE_AUTHOR("Raghavendra Koushik <raghavendra.koushik@neterion.com>"); | ||
398 | MODULE_LICENSE("GPL"); | 397 | MODULE_LICENSE("GPL"); |
399 | MODULE_VERSION(DRV_VERSION); | 398 | MODULE_VERSION(DRV_VERSION); |
400 | 399 | ||