[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>
This commit is contained in:
shemminger@osdl.org 2005-11-30 11:45:11 -08:00 committed by Jeff Garzik
parent e538af42e4
commit 2143764348
2 changed files with 2 additions and 13 deletions

View file

@ -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

View file

@ -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))