diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-04-08 05:43:30 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-04-08 05:43:30 -0400 |
| commit | 529801898b24544f93532217ce18a7ebbb2b8c4f (patch) | |
| tree | c51c8fd808e6cff15cabb1a9ac29be0661942384 /drivers/net/ethernet/renesas/sh_eth.h | |
| parent | b847d0501afec4c7b12eb276aec10a2834f953ea (diff) | |
| parent | 23995bbee01d75f09f72b1380bd6045a5b02947b (diff) | |
Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core
Pull IBM zEnterprise EC12 support patchlet from Robert Richter.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/renesas/sh_eth.h')
| -rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h index bae84fd2e73a..e6655678458e 100644 --- a/drivers/net/ethernet/renesas/sh_eth.h +++ b/drivers/net/ethernet/renesas/sh_eth.h | |||
| @@ -705,6 +705,7 @@ struct sh_eth_private { | |||
| 705 | const u16 *reg_offset; | 705 | const u16 *reg_offset; |
| 706 | void __iomem *addr; | 706 | void __iomem *addr; |
| 707 | void __iomem *tsu_addr; | 707 | void __iomem *tsu_addr; |
| 708 | struct bb_info *bitbang; | ||
| 708 | u32 num_rx_ring; | 709 | u32 num_rx_ring; |
| 709 | u32 num_tx_ring; | 710 | u32 num_tx_ring; |
| 710 | dma_addr_t rx_desc_dma; | 711 | dma_addr_t rx_desc_dma; |