diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/sfc/mac.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/sfc/mac.h')
| -rw-r--r-- | drivers/net/sfc/mac.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/sfc/mac.h b/drivers/net/sfc/mac.h index f1aa5f374890..d6a255d0856b 100644 --- a/drivers/net/sfc/mac.h +++ b/drivers/net/sfc/mac.h | |||
| @@ -13,10 +13,8 @@ | |||
| 13 | 13 | ||
| 14 | #include "net_driver.h" | 14 | #include "net_driver.h" |
| 15 | 15 | ||
| 16 | extern struct efx_mac_operations falcon_gmac_operations; | 16 | extern const struct efx_mac_operations falcon_xmac_operations; |
| 17 | extern struct efx_mac_operations falcon_xmac_operations; | 17 | extern const struct efx_mac_operations efx_mcdi_mac_operations; |
| 18 | extern struct efx_mac_operations efx_mcdi_mac_operations; | ||
| 19 | extern void falcon_reconfigure_xmac_core(struct efx_nic *efx); | ||
| 20 | extern int efx_mcdi_mac_stats(struct efx_nic *efx, dma_addr_t dma_addr, | 18 | extern int efx_mcdi_mac_stats(struct efx_nic *efx, dma_addr_t dma_addr, |
| 21 | u32 dma_len, int enable, int clear); | 19 | u32 dma_len, int enable, int clear); |
| 22 | 20 | ||