---

yaml --- r: 268773 b: refs/heads/master c: b6f4160 h: refs/heads/master i: 268771: 0d437eb v: v3
git-mirror · Oct 11, 2011 · 0b0ab90 · 0b0ab90
1 parent a1a98fe
commit 0b0ab90
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 92 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f247be5d6b5bf5378a9cfec2e315b1ae913f8f0d
+refs/heads/master: b6f4160c4e5a1565fbb06976233e6482c16a489c
diff --git a/trunk/drivers/staging/et131x/et1310_eeprom.c b/trunk/drivers/staging/et131x/et1310_eeprom.c
@@ -57,7 +57,6 @@
  *
  */
 
-#include "et131x_version.h"
 #include "et131x_defs.h"
 
 #include <linux/pci.h>

diff --git a/trunk/drivers/staging/et131x/et1310_mac.c b/trunk/drivers/staging/et131x/et1310_mac.c
@@ -57,7 +57,6 @@
  *
  */
 
-#include "et131x_version.h"
 #include "et131x_defs.h"
 
 #include <linux/init.h>

diff --git a/trunk/drivers/staging/et131x/et1310_phy.c b/trunk/drivers/staging/et131x/et1310_phy.c
@@ -57,7 +57,6 @@
  *
  */
 
-#include "et131x_version.h"
 #include "et131x_defs.h"
 
 #include <linux/pci.h>

diff --git a/trunk/drivers/staging/et131x/et1310_pm.c b/trunk/drivers/staging/et131x/et1310_pm.c
@@ -57,7 +57,6 @@
  *
  */
 
-#include "et131x_version.h"
 #include "et131x_defs.h"
 
 #include <linux/init.h>

diff --git a/trunk/drivers/staging/et131x/et1310_rx.c b/trunk/drivers/staging/et131x/et1310_rx.c
@@ -57,7 +57,6 @@
  *
  */
 
-#include "et131x_version.h"
 #include "et131x_defs.h"
 
 #include <linux/pci.h>

diff --git a/trunk/drivers/staging/et131x/et1310_tx.c b/trunk/drivers/staging/et131x/et1310_tx.c
@@ -57,7 +57,6 @@
  *
  */
 
-#include "et131x_version.h"
 #include "et131x_defs.h"
 
 #include <linux/pci.h>

diff --git a/trunk/drivers/staging/et131x/et131x.h b/trunk/drivers/staging/et131x/et131x.h
@@ -48,6 +48,9 @@
  *
  */
 
+#define DRIVER_NAME "et131x"
+#define DRIVER_VERSION "v2.0"
+
 /* et131x_eeprom.c */
 int et131x_init_eeprom(struct et131x_adapter *adapter);
 

diff --git a/trunk/drivers/staging/et131x/et131x_ethtool.c b/trunk/drivers/staging/et131x/et131x_ethtool.c
@@ -15,7 +15,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#include "et131x_version.h"
+
 #include "et131x_defs.h"
 
 #include <linux/types.h>
@@ -181,7 +181,7 @@ static void et131x_get_drvinfo(struct net_device *netdev,
 	struct et131x_adapter *adapter = netdev_priv(netdev);
 
 	strncpy(info->driver, DRIVER_NAME, ET131X_DRVINFO_LEN);
-	strncpy(info->version, DRIVER_VERSION_STRING, ET131X_DRVINFO_LEN);
+	strncpy(info->version, DRIVER_VERSION, ET131X_DRVINFO_LEN);
 	strncpy(info->bus_info, pci_name(adapter->pdev), ET131X_DRVINFO_LEN);
 }
 

diff --git a/trunk/drivers/staging/et131x/et131x_initpci.c b/trunk/drivers/staging/et131x/et131x_initpci.c
@@ -59,7 +59,6 @@
  *
  */
 
-#include "et131x_version.h"
 #include "et131x_defs.h"
 
 #include <linux/pci.h>
@@ -944,8 +943,8 @@ static void __exit et131x_cleanup_module(void)
 module_init(et131x_init_module);
 module_exit(et131x_cleanup_module);
 
-/* Modinfo parameters (filled out using defines from et131x_version.h) */
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_AUTHOR(DRIVER_AUTHOR2);
-MODULE_DESCRIPTION(DRIVER_INFO);
-MODULE_LICENSE(DRIVER_LICENSE);
+MODULE_AUTHOR("Victor Soriano <vjsoriano@agere.com>");
+MODULE_AUTHOR("Mark Einon <mark.einon@gmail.com>");
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_DESCRIPTION("10/100/1000 Base-T Ethernet Driver "
+		   "for the ET1310 by Agere Systems");
diff --git a/trunk/drivers/staging/et131x/et131x_isr.c b/trunk/drivers/staging/et131x/et131x_isr.c
@@ -58,7 +58,6 @@
  *
  */
 
-#include "et131x_version.h"
 #include "et131x_defs.h"
 
 #include <linux/init.h>

diff --git a/trunk/drivers/staging/et131x/et131x_netdev.c b/trunk/drivers/staging/et131x/et131x_netdev.c
@@ -57,7 +57,6 @@
  *
  */
 
-#include "et131x_version.h"
 #include "et131x_defs.h"
 
 #include <linux/init.h>

diff --git a/trunk/drivers/staging/et131x/et131x_version.h b/trunk/drivers/staging/et131x/et131x_version.h
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,7 +57,6 @@ @@
      *
      */
-    #include "et131x_version.h"
     #include "et131x_defs.h"
     #include <linux/pci.h>
@@ Expand Down @@