---

yaml --- r: 15745 b: refs/heads/master c: 2143764 h: refs/heads/master i: 15743: 37b913d v: v3
git-mirror · Dec 1, 2005 · f9ff4af · f9ff4af
1 parent 55f7703
commit f9ff4af
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e538af42e416ac17368593370f7e1f5a71d55197
+refs/heads/master: 214376434863f9ca109a7853fbbd6db284d3fba7
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -2022,13 +2022,6 @@ config SKY2
 	  To compile this driver as a module, choose M here: the module
 	  will be called sky2.  This is recommended.
 
-config SKY2_EC_A1
-	bool "Support old Yukon-EC A1 chipset"
-	depends on SKY2
-	---help---
-	  Include support for early revisions of the Yukon EC chipset
-	  that required extra workarounds. If in doubt, say N.
-
 config SK98LIN
 	tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support"
 	depends on PCI

diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
@@ -67,13 +67,9 @@
  * a receive requires one (or two if using 64 bit dma).
  */
 
-#ifdef CONFIG_SKY2_EC_A1
 #define is_ec_a1(hw) \
-	((hw)->chip_id == CHIP_ID_YUKON_EC && \
-	 (hw)->chip_rev == CHIP_REV_YU_EC_A1)
-#else
-#define is_ec_a1(hw)	0
-#endif
+	unlikely((hw)->chip_id == CHIP_ID_YUKON_EC && \
+		 (hw)->chip_rev == CHIP_REV_YU_EC_A1)
 
 #define RX_LE_SIZE	    	256
 #define RX_LE_BYTES		(RX_LE_SIZE*sizeof(struct sky2_rx_le))