[GFS2] Fix up merge of Linus' kernel into GFS2

[linux-2.6-omap-h63xx.git] / drivers / net / tulip / media.c

diff --git a/drivers/net/tulip/media.c b/drivers/net/tulip/media.c
index f53396fe79c9f95d296dc3995208f0f66c3da8b8..20bd52b869937e5691e3118d210fcd3ae9c1418e 100644 (file)
--- a/drivers/net/tulip/media.c
+++ b/drivers/net/tulip/media.c
@@ -1,7 +1,7 @@
 /*
        drivers/net/tulip/media.c
 
-       Maintained by Jeff Garzik <jgarzik@pobox.com>
+       Maintained by Valerie Henson <val_henson@linux.intel.com>
        Copyright 2000,2001  The Linux Kernel Team
        Written/copyright 1994-2001 by Donald Becker.
 
@@ -140,7 +140,7 @@ void tulip_mdio_write(struct net_device *dev, int phy_id, int location, int val)
                spin_unlock_irqrestore(&tp->mii_lock, flags);
                return;
        }
-               
+
        /* Establish sync by sending 32 logic ones. */
        for (i = 32; i >= 0; i--) {
                iowrite32(MDIO_ENB | MDIO_DATA_WRITE1, mdio_addr);