Merge redhat.com:/spare/repo/netdev-2.6/natsemi

into redhat.com:/spare/repo/netdev-2.6/misc

drivers/net/ne2k-pci.c

@@ -115,6 +115,7 @@ enum ne2k_pci_chipsets {
 	CH_Winbond_W89C940F,
 	CH_Holtek_HT80232,
 	CH_Holtek_HT80229,
+	CH_Winbond_89C940_8c4a,
 };
 
 
@@ -132,6 +133,7 @@ static struct {
 	{"Winbond W89C940F", 0},
 	{"Holtek HT80232", ONLY_16BIT_IO | HOLTEK_FDX},
 	{"Holtek HT80229", ONLY_32BIT_IO | HOLTEK_FDX | STOP_PG_0x60 },
+	{"Winbond W89C940(misprogrammed)", 0},
 	{0,}
 };
 
@@ -147,6 +149,7 @@ static struct pci_device_id ne2k_pci_tbl[] = {
 	{ 0x1050, 0x5a5a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Winbond_W89C940F },
 	{ 0x12c3, 0x0058, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Holtek_HT80232 },
 	{ 0x12c3, 0x5598, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Holtek_HT80229 },
+	{ 0x8c4a, 0x1980, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Winbond_89C940_8c4a },
 	{ 0, }
 };
 MODULE_DEVICE_TABLE(pci, ne2k_pci_tbl);

drivers/net/starfire.c

@@ -139,7 +139,6 @@ TODO:	bugfixes (no bugs known as of right now)
 #include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
-#include <asm/io.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/netdevice.h>

drivers/net/tokenring/smctr.c

@@ -729,10 +729,6 @@ static int smctr_close(struct net_device *dev)
 
 	netif_stop_queue(dev);
 	
-#ifdef MODULE
-        MOD_DEC_USE_COUNT;
-#endif
-
 	tp->cleanup = 1;
 
         /* Check to see if adapter is already in a closed state. */
@@ -3490,10 +3486,6 @@ static int smctr_open(struct net_device *dev)
         if(err < 0)
                 return (err);
 
-#ifdef MODULE
-        MOD_INC_USE_COUNT;
-#endif
-
         return (err);
 }
 

drivers/net/wan/farsync.c

@@ -1313,8 +1313,6 @@ fst_open ( struct net_device *dev )
         if ( err )
                 return err;
 
-        MOD_INC_USE_COUNT;
-
         fst_openport ( dev_to_port ( dev ));
         netif_wake_queue ( dev );
         return 0;
@@ -1326,7 +1324,6 @@ fst_close ( struct net_device *dev )
         netif_stop_queue ( dev );
         fst_closeport ( dev_to_port ( dev ));
         hdlc_close ( dev_to_hdlc  ( dev ));
-        MOD_DEC_USE_COUNT;
         return 0;
 }
 

drivers/net/wan/pc300_drv.c

@@ -3165,7 +3165,6 @@ int cpc_open(struct net_device *dev)
 		return result;
 	}
 
-	MOD_INC_USE_COUNT;
 	sprintf(ifr.ifr_name, "%s", dev->name);
 	cpc_opench(d);
 	netif_start_queue(dev);
@@ -3201,7 +3200,6 @@ int cpc_close(struct net_device *dev)
 	}
 #endif
 
-	MOD_DEC_USE_COUNT;
 	return 0;
 }
 

drivers/net/wireless/orinoco_pci.c

@@ -360,6 +360,7 @@ static int orinoco_pci_resume(struct pci_dev *pdev)
 }
 
 static struct pci_device_id orinoco_pci_pci_id_table[] = {
+	{0x1260, 0x3872, PCI_ANY_ID, PCI_ANY_ID,},
 	{0x1260, 0x3873, PCI_ANY_ID, PCI_ANY_ID,},
 	{0,},
 };