diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-12 20:26:45 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-12 20:26:45 (GMT) |
| commit | d44cf14ddf5a7e61d7acf13bc430111783d9c6aa (patch) | |
| tree | d2e3403e4ba51327b329e57124c3ec429dd89001 /drivers/net/sfc/nic.h | |
| parent | 21ccc7936dac5ca9b3e2838bbc112a60f34e18b3 (diff) | |
| parent | 747df2258b1b9a2e25929ef496262c339c380009 (diff) | |
| download | linux-fsl-qoriq-d44cf14ddf5a7e61d7acf13bc430111783d9c6aa.tar.xz | |
Merge branch 'sfc-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-2.6
Diffstat (limited to 'drivers/net/sfc/nic.h')
| -rw-r--r-- | drivers/net/sfc/nic.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/sfc/nic.h b/drivers/net/sfc/nic.h index a42db6e..d91701a 100644 --- a/drivers/net/sfc/nic.h +++ b/drivers/net/sfc/nic.h @@ -143,10 +143,12 @@ static inline struct falcon_board *falcon_board(struct efx_nic *efx) /** * struct siena_nic_data - Siena NIC state * @mcdi: Management-Controller-to-Driver Interface + * @mcdi_smem: MCDI shared memory mapping. The mapping is always uncacheable. * @wol_filter_id: Wake-on-LAN packet filter id */ struct siena_nic_data { struct efx_mcdi_iface mcdi; + void __iomem *mcdi_smem; int wol_filter_id; }; |