diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-25 04:51:37 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-25 04:51:37 -0400 |
| commit | ad14ad735f48ca39e5de8dc7a9186509e7c196e3 (patch) | |
| tree | 48472c7f74e3f0f31667b87b7a6639d476885ee9 /include/linux/spi | |
| parent | b3d6c80050900f55b3f51eba97c3e563d5d099c0 (diff) | |
| parent | cb52c673f8adc4a1cba7b645ff5375b57dae21fa (diff) | |
Merge remote-tracking branch 'spi/topic/rspi' into spi-next
Diffstat (limited to 'include/linux/spi')
| -rw-r--r-- | include/linux/spi/rspi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/spi/rspi.h b/include/linux/spi/rspi.h index 900f0e328235..a25bd6f65e7f 100644 --- a/include/linux/spi/rspi.h +++ b/include/linux/spi/rspi.h | |||
| @@ -26,6 +26,8 @@ struct rspi_plat_data { | |||
| 26 | unsigned int dma_rx_id; | 26 | unsigned int dma_rx_id; |
| 27 | 27 | ||
| 28 | unsigned dma_width_16bit:1; /* DMAC read/write width = 16-bit */ | 28 | unsigned dma_width_16bit:1; /* DMAC read/write width = 16-bit */ |
| 29 | |||
| 30 | u16 num_chipselect; | ||
| 29 | }; | 31 | }; |
| 30 | 32 | ||
| 31 | #endif | 33 | #endif |