diff options
author | David S. Miller <davem@davemloft.net> | 2008-05-23 03:05:14 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-05-23 03:05:14 -0400 |
commit | 7bece8155be133cd67c41eed2b31c60a310609de (patch) | |
tree | 906a62dcf10c1f2e6c1188a2b6e386668fcd9fe3 /drivers/net/sfc/workarounds.h | |
parent | b9a2f2e450b0f770bb4347ae8d48eb2dea701e24 (diff) | |
parent | bdefff1f54cb76a19700663f211350de2f65cc91 (diff) |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/sfc/workarounds.h')
-rw-r--r-- | drivers/net/sfc/workarounds.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sfc/workarounds.h b/drivers/net/sfc/workarounds.h index dca62f190198..35ab19c27f8d 100644 --- a/drivers/net/sfc/workarounds.h +++ b/drivers/net/sfc/workarounds.h | |||
@@ -16,7 +16,7 @@ | |||
16 | */ | 16 | */ |
17 | 17 | ||
18 | #define EFX_WORKAROUND_ALWAYS(efx) 1 | 18 | #define EFX_WORKAROUND_ALWAYS(efx) 1 |
19 | #define EFX_WORKAROUND_FALCON_A(efx) (FALCON_REV(efx) <= FALCON_REV_A1) | 19 | #define EFX_WORKAROUND_FALCON_A(efx) (falcon_rev(efx) <= FALCON_REV_A1) |
20 | 20 | ||
21 | /* XAUI resets if link not detected */ | 21 | /* XAUI resets if link not detected */ |
22 | #define EFX_WORKAROUND_5147 EFX_WORKAROUND_ALWAYS | 22 | #define EFX_WORKAROUND_5147 EFX_WORKAROUND_ALWAYS |