Merge remote-tracking branches 'spi/topic/oom', 'spi/topic/pxa2xx', 'spi/topic/rspi' and 'spi/topic/sirf' into spi-next

2014-06-02 17:08:41 +01:00
parent 8fb3b066a6 fe75cbc1bd 836d1a22db 8b983e90ea 41148c3a72
commit 301d8384b5
11 changed files with 464 additions and 579 deletions
--- a/include/linux/spi/rspi.h
+++ b/include/linux/spi/rspi.h
@@ -25,8 +25,6 @@ struct rspi_plat_data {
 	unsigned int dma_tx_id;
 	unsigned int dma_rx_id;

-	unsigned dma_width_16bit:1;	/* DMAC read/write width = 16-bit */
-
 	u16 num_chipselect;
 };