[PATCH] sky2: eliminate special case for EC-A1

Eliminate special case for EC-A1. The overhead isn't so
great that having config option is worth it.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 9f89000e5ad5..d7a94d62d80f 100644
--- a/drivers/net/sky2.c
+++ b/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))