aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS13
-rw-r--r--drivers/net/s2io.c3
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
2512L: linux-fbdev-devel@lists.sourceforge.net (subscribers-only) 2512L: linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
2513S: Maintained 2513S: Maintained
2514 2514
2515NETERION (S2IO) Xframe 10GbE DRIVER
2516P: Ramkrishna Vepa
2517M: ram.vepa@neterion.com
2518P: Rastapur Santosh
2519M: santosh.rastapur@neterion.com
2520P: Sivakumar Subramani
2521M: sivakumar.subramani@neterion.com
2522P: Sreenivasa Honnur
2523M: sreenivasa.honnur@neterion.com
2524L: netdev@vger.kernel.org
2525W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/TitleIndex?anonymous
2526S: Supported
2527
2515OPENCORES I2C BUS DRIVER 2528OPENCORES I2C BUS DRIVER
2516P: Peter Korsgaard 2529P: Peter Korsgaard
2517M: jacmet@sunsite.dk 2530M: 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. */
90static char s2io_driver_name[] = "Neterion"; 90static char s2io_driver_name[] = "Neterion";
@@ -394,7 +394,6 @@ static const u64 fix_mac[] = {
394 END_SIGN 394 END_SIGN
395}; 395};
396 396
397MODULE_AUTHOR("Raghavendra Koushik <raghavendra.koushik@neterion.com>");
398MODULE_LICENSE("GPL"); 397MODULE_LICENSE("GPL");
399MODULE_VERSION(DRV_VERSION); 398MODULE_VERSION(DRV_VERSION);
400 399