Merge remote-tracking branches 'spi/topic/sh', 'spi/topic/sh-msiof' and 'spi/topic/topcliff-pch' into spi-next

2014-08-04 17:21:16 +01:00
parent 0c18b7638a e9d42d1527 5dabcf2f27 a9082105b3
commit fab6a0410d
5 changed files with 494 additions and 64 deletions
@@ -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__ */