summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2014-07-21 15:13:37 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2014-07-21 15:13:37 +1000
commitd8f0a4ed3739df0075f5b0931ccf49d0955c70af (patch)
treeb06d205ce3dc6e3d982d734a0300f7384bd8fd83 /include
parent9b10fc729f9cfb13cdb4e2b2823812d9a95d5461 (diff)
parent0f1bd07a82d38f67b01245948afabf40eff3c2d4 (diff)
Merge remote-tracking branch 'spi/for-next'
Diffstat (limited to 'include')
-rw-r--r--include/linux/spi/sh_msiof.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/spi/sh_msiof.h b/include/linux/spi/sh_msiof.h
index 2e8db3d2d2e5..88a14d81c49e 100644
--- a/include/linux/spi/sh_msiof.h
+++ b/include/linux/spi/sh_msiof.h
@@ -5,6 +5,8 @@ struct sh_msiof_spi_info {
int tx_fifo_override;
int rx_fifo_override;
u16 num_chipselect;
+ unsigned int dma_tx_id;
+ unsigned int dma_rx_id;
};
#endif /* __SPI_SH_MSIOF_H__ */