diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-17 04:24:53 +0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-17 04:24:53 +0400 |
commit | 492b057c426e4aa747484958e18e9da29003985d (patch) | |
tree | 34e08c24618688d8bcc190523028b5f94cce0c0b /drivers/net/sfc/selftest.h | |
parent | 313485175da221c388f6a8ecf4c30062ba9bea17 (diff) | |
parent | 300df7dc89cc276377fc020704e34875d5c473b6 (diff) | |
download | linux-492b057c426e4aa747484958e18e9da29003985d.tar.xz |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/net/sfc/selftest.h')
-rw-r--r-- | drivers/net/sfc/selftest.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sfc/selftest.h b/drivers/net/sfc/selftest.h index 39451cf938cf..f6feee04c96b 100644 --- a/drivers/net/sfc/selftest.h +++ b/drivers/net/sfc/selftest.h @@ -32,7 +32,7 @@ struct efx_loopback_self_tests { */ struct efx_self_tests { /* online tests */ - int mii; + int mdio; int nvram; int interrupt; int eventq_dma[EFX_MAX_CHANNELS]; |