diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-07 22:16:43 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-07 22:16:43 -0500 |
| commit | 81306d53da7efde6fa17c04700b8782e08006e80 (patch) | |
| tree | a64e4a2e6499f45da3bbd72af035f0000fba8b5c /include/linux | |
| parent | f69c22ed22a0529143aea74ead7696d6a8b8269d (diff) | |
| parent | 19f0ad0942d560d33afedc66a27fe7d6e67373dc (diff) | |
Merge remote-tracking branch 'spi/topic/sh-msiof' into spi-next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/spi/sh_msiof.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/spi/sh_msiof.h b/include/linux/spi/sh_msiof.h index 88a14d81c49e..b087a85f5f72 100644 --- a/include/linux/spi/sh_msiof.h +++ b/include/linux/spi/sh_msiof.h | |||
| @@ -7,6 +7,8 @@ struct sh_msiof_spi_info { | |||
| 7 | u16 num_chipselect; | 7 | u16 num_chipselect; |
| 8 | unsigned int dma_tx_id; | 8 | unsigned int dma_tx_id; |
| 9 | unsigned int dma_rx_id; | 9 | unsigned int dma_rx_id; |
| 10 | u32 dtdl; | ||
| 11 | u32 syncdl; | ||
| 10 | }; | 12 | }; |
| 11 | 13 | ||
| 12 | #endif /* __SPI_SH_MSIOF_H__ */ | 14 | #endif /* __SPI_SH_MSIOF_H__ */ |