patch-2.4.20 linux-2.4.20/drivers/net/tulip/tulip.h

Next file: linux-2.4.20/drivers/net/tulip/tulip_core.c
Previous file: linux-2.4.20/drivers/net/tulip/interrupt.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.19/drivers/net/tulip/tulip.h linux-2.4.20/drivers/net/tulip/tulip.h
@@ -63,6 +63,7 @@
 	HAS_8023X		= 0x0400,
 	COMET_MAC_ADDR		= 0x0800,
 	HAS_PCI_MWI		= 0x1000,
+	HAS_PHY_IRQ		= 0x2000,
 };
 
 
@@ -84,6 +85,7 @@
 	COMPEX9881,
 	I21145,
 	DM910X,
+	CONEXANT,
 };
 
 
@@ -387,7 +389,8 @@
 	int susp_rx;
 	unsigned long nir;
 	unsigned long base_addr;
-	int pad0, pad1;		/* Used for 8-byte alignment */
+	int csr12_shadow;
+	int pad0;		/* Used for 8-byte alignment */
 };
 
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)