10 files changed, 24 insertions, 36 deletions

diff --git a/drivers/net/tulip/21142.c b/drivers/net/tulip/21142.c
index 6c400ccd38b4..1210fb3748a7 100644
--- a/drivers/net/tulip/21142.c
+++ b/drivers/net/tulip/21142.c
@@ -1,7 +1,6 @@
 /*
         drivers/net/tulip/21142.c
 
-        Maintained by Valerie Henson <val_henson@linux.intel.com>
         Copyright 2000,2001  The Linux Kernel Team
         Written/copyright 1994-2001 by Donald Becker.
 
@@ -9,9 +8,8 @@
         of the GNU General Public License, incorporated herein by reference.
 
         Please refer to Documentation/DocBook/tulip-user.{pdf,ps,html}
-        for more information on this driver, or visit the project
-        Web page at http://sourceforge.net/projects/tulip/
-
+        for more information on this driver.
+        Please submit bugs to http://bugzilla.kernel.org/ .
 */
 
 #include <linux/delay.h>
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 1b5edd646a8c..9281d06d5aaa 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -124,8 +124,6 @@ MODULE_PARM_DESC (rx_copybreak, "de2104x Breakpoint at which Rx packets are copi
 /* Time in jiffies before concluding the transmitter is hung. */
 #define TX_TIMEOUT              (6*HZ)
 
-#define DE_UNALIGNED_16(a)      (u16)(get_unaligned((u16 *)(a)))
-
 /* This is a mysterious value that can be written to CSR11 in the 21040 (only)
    to support a pre-NWay full-duplex signaling mechanism using short frames.
    No one knows what it should be, but if left at its default value some
@@ -1811,7 +1809,7 @@ static void __devinit de21041_get_srom_info (struct de_private *de)
                 goto bad_srom;
 
         /* get default media type */
-        switch (DE_UNALIGNED_16(&il->default_media)) {
+        switch (get_unaligned(&il->default_media)) {
         case 0x0001:  de->media_type = DE_MEDIA_BNC; break;
         case 0x0002:  de->media_type = DE_MEDIA_AUI; break;
         case 0x0204:  de->media_type = DE_MEDIA_TP_FD; break;
@@ -1875,9 +1873,9 @@ static void __devinit de21041_get_srom_info (struct de_private *de)
                 bufp += sizeof (ib->opts);
 
                 if (ib->opts & MediaCustomCSRs) {
-                        de->media[idx].csr13 = DE_UNALIGNED_16(&ib->csr13);
-                        de->media[idx].csr14 = DE_UNALIGNED_16(&ib->csr14);
-                        de->media[idx].csr15 = DE_UNALIGNED_16(&ib->csr15);
+                        de->media[idx].csr13 = get_unaligned(&ib->csr13);
+                        de->media[idx].csr14 = get_unaligned(&ib->csr14);
+                        de->media[idx].csr15 = get_unaligned(&ib->csr15);
                         bufp += sizeof(ib->csr13) + sizeof(ib->csr14) +
                                 sizeof(ib->csr15);
 
diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/tulip/eeprom.c
index da2206f6021d..0dcced1263b9 100644
--- a/drivers/net/tulip/eeprom.c
+++ b/drivers/net/tulip/eeprom.c
@@ -1,7 +1,6 @@
 /*
         drivers/net/tulip/eeprom.c
 
-        Maintained by Valerie Henson <val_henson@linux.intel.com>
         Copyright 2000,2001  The Linux Kernel Team
         Written/copyright 1994-2001 by Donald Becker.
 
@@ -9,9 +8,8 @@
         of the GNU General Public License, incorporated herein by reference.
 
         Please refer to Documentation/DocBook/tulip-user.{pdf,ps,html}
-        for more information on this driver, or visit the project
-        Web page at http://sourceforge.net/projects/tulip/
-
+        for more information on this driver.
+        Please submit bug reports to http://bugzilla.kernel.org/.
 */
 
 #include <linux/pci.h>
diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c
index 6284afd14bbb..c6bad987d63e 100644
--- a/drivers/net/tulip/interrupt.c
+++ b/drivers/net/tulip/interrupt.c
@@ -1,7 +1,6 @@
 /*
         drivers/net/tulip/interrupt.c
 
-        Maintained by Valerie Henson <val_henson@linux.intel.com>
         Copyright 2000,2001  The Linux Kernel Team
         Written/copyright 1994-2001 by Donald Becker.
 
@@ -9,8 +8,8 @@
         of the GNU General Public License, incorporated herein by reference.
 
         Please refer to Documentation/DocBook/tulip-user.{pdf,ps,html}
-        for more information on this driver, or visit the project
-        Web page at http://sourceforge.net/projects/tulip/
+        for more information on this driver.
+        Please submit bugs to http://bugzilla.kernel.org/ .
 
 */
 
diff --git a/drivers/net/tulip/media.c b/drivers/net/tulip/media.c
index b56256636543..91cf9c863910 100644
--- a/drivers/net/tulip/media.c
+++ b/drivers/net/tulip/media.c
@@ -1,7 +1,6 @@
 /*
         drivers/net/tulip/media.c
 
-        Maintained by Valerie Henson <val_henson@linux.intel.com>
         Copyright 2000,2001  The Linux Kernel Team
         Written/copyright 1994-2001 by Donald Becker.
 
@@ -9,9 +8,9 @@
         of the GNU General Public License, incorporated herein by reference.
 
         Please refer to Documentation/DocBook/tulip-user.{pdf,ps,html}
-        for more information on this driver, or visit the project
-        Web page at http://sourceforge.net/projects/tulip/
+        for more information on this driver.
 
+        Please submit bugs to http://bugzilla.kernel.org/ .
 */
 
 #include <linux/kernel.h>
diff --git a/drivers/net/tulip/pnic.c b/drivers/net/tulip/pnic.c
index be82a2effee3..d3253ed09dfc 100644
--- a/drivers/net/tulip/pnic.c
+++ b/drivers/net/tulip/pnic.c
@@ -1,7 +1,6 @@
 /*
         drivers/net/tulip/pnic.c
 
-        Maintained by Valerie Henson <val_henson@linux.intel.com>
         Copyright 2000,2001  The Linux Kernel Team
         Written/copyright 1994-2001 by Donald Becker.
 
@@ -9,9 +8,9 @@
         of the GNU General Public License, incorporated herein by reference.
 
         Please refer to Documentation/DocBook/tulip-user.{pdf,ps,html}
-        for more information on this driver, or visit the project
-        Web page at http://sourceforge.net/projects/tulip/
+        for more information on this driver.
 
+        Please submit bugs to http://bugzilla.kernel.org/ .
 */
 
 #include <linux/kernel.h>
diff --git a/drivers/net/tulip/pnic2.c b/drivers/net/tulip/pnic2.c
index 4e4a879c3fa5..f49579128fb5 100644
--- a/drivers/net/tulip/pnic2.c
+++ b/drivers/net/tulip/pnic2.c
@@ -1,7 +1,6 @@
 /*
         drivers/net/tulip/pnic2.c
 
-        Maintained by Valerie Henson <val_henson@linux.intel.com>
         Copyright 2000,2001  The Linux Kernel Team
         Written/copyright 1994-2001 by Donald Becker.
         Modified to hep support PNIC_II by Kevin B. Hendricks
@@ -10,9 +9,9 @@
         of the GNU General Public License, incorporated herein by reference.
 
         Please refer to Documentation/DocBook/tulip-user.{pdf,ps,html}
-        for more information on this driver, or visit the project
-        Web page at http://sourceforge.net/projects/tulip/
+        for more information on this driver.
 
+        Please submit bugs to http://bugzilla.kernel.org/ .
 */
 
 
diff --git a/drivers/net/tulip/timer.c b/drivers/net/tulip/timer.c
index d2c1f42109b0..a0e084223082 100644
--- a/drivers/net/tulip/timer.c
+++ b/drivers/net/tulip/timer.c
@@ -1,7 +1,6 @@
 /*
         drivers/net/tulip/timer.c
 
-        Maintained by Valerie Henson <val_henson@linux.intel.com>
         Copyright 2000,2001  The Linux Kernel Team
         Written/copyright 1994-2001 by Donald Becker.
 
@@ -9,11 +8,12 @@
         of the GNU General Public License, incorporated herein by reference.
 
         Please refer to Documentation/DocBook/tulip-user.{pdf,ps,html}
-        for more information on this driver, or visit the project
-        Web page at http://sourceforge.net/projects/tulip/
+        for more information on this driver.
 
+        Please submit bugs to http://bugzilla.kernel.org/ .
 */
 
+
 #include "tulip.h"
 
 
diff --git a/drivers/net/tulip/tulip.h b/drivers/net/tulip/tulip.h
index 92c68a22f16b..19abbc36b60a 100644
--- a/drivers/net/tulip/tulip.h
+++ b/drivers/net/tulip/tulip.h
@@ -8,9 +8,9 @@
         of the GNU General Public License, incorporated herein by reference.
 
         Please refer to Documentation/DocBook/tulip-user.{pdf,ps,html}
-        for more information on this driver, or visit the project
-        Web page at http://sourceforge.net/projects/tulip/
+        for more information on this driver.
 
+        Please submit bugs to http://bugzilla.kernel.org/ .
 */
 
 #ifndef __NET_TULIP_H__
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index af8d2c436efd..cafa89e60167 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -1,7 +1,5 @@
-/* tulip_core.c: A DEC 21x4x-family ethernet driver for Linux. */
+/*      tulip_core.c: A DEC 21x4x-family ethernet driver for Linux.
 
-/*
-        Maintained by Valerie Henson <val_henson@linux.intel.com>
         Copyright 2000,2001  The Linux Kernel Team
         Written/copyright 1994-2001 by Donald Becker.
 
@@ -9,9 +7,9 @@
         of the GNU General Public License, incorporated herein by reference.
 
         Please refer to Documentation/DocBook/tulip-user.{pdf,ps,html}
-        for more information on this driver, or visit the project
-        Web page at http://sourceforge.net/projects/tulip/
+        for more information on this driver.
 
+        Please submit bugs to http://bugzilla.kernel.org/ .
 */