Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/bcm2835', 'spi/topic/bcm63xx-hsspi' and 'spi/topic/davinci' into spi-next

2015-08-31 14:45:29 +01:00
parent 8e42ac814c bdbbd38106 ca861dd0c5 f4d8622377 1b0838b5a7
commit 9d05943e79
8 changed files with 56 additions and 15 deletions
@@ -49,6 +49,7 @@ struct davinci_spi_platform_data {
 	u8			num_chipselect;
 	u8			intr_line;
 	u8			*chip_sel;
+	u8			prescaler_limit;
 	bool			cshold_bug;
 	enum dma_event_q	dma_event_q;
 };