Merge branch 'docs' of git://git.lwn.net/linux-2.6

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

diff --git a/drivers/net/tulip/pnic2.c b/drivers/net/tulip/pnic2.c
index 55f4a9a631bc62226b670cdfcbd7bdaced3c931c..4e4a879c3fa56b500b5b2c05c22c35efc1b13b1e 100644 (file)
--- a/drivers/net/tulip/pnic2.c
+++ b/drivers/net/tulip/pnic2.c
@@ -1,7 +1,7 @@
 /*
        drivers/net/tulip/pnic2.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.
         Modified to hep support PNIC_II by Kevin B. Hendricks
@@ -76,7 +76,6 @@
 
 
 
-#include <linux/pci.h>
 #include "tulip.h"
 #include <linux/delay.h>
 
@@ -199,7 +198,7 @@ void pnic2_lnk_change(struct net_device *dev, int csr5)
                       /* negotiation ended successfully */
 
                       /* get the link partners reply and mask out all but
-                        * bits 24-21 which show the partners capabilites
+                        * bits 24-21 which show the partners capabilities
                         * and match those to what we advertised
                         *
                         * then begin to interpret the results of the negotiation.