From: Mark Brown <broonie@kernel.org>
Date: Thu, 29 Nov 2018 16:23:39 +0000 (+0000)
Subject: Merge branch 'for-4.20' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: for-linus-20190104~127^2~1^2~23
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=5651248697f70aad78aa0208490c776d1f842315;p=linux-2.6-block.git

Merge branch 'for-4.20' of https://git./linux/kernel/git/broonie/spi into spi-4.21
---

5651248697f70aad78aa0208490c776d1f842315
diff --cc drivers/spi/spi-bcm2835.c
index 232002db2696,25abf2d1732a..5cbdc94bb4cf
--- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c
@@@ -106,10 -88,7 +106,10 @@@ struct bcm2835_spi 
  	u8 *rx_buf;
  	int tx_len;
  	int rx_len;
 +	int tx_prologue;
 +	int rx_prologue;
 +	bool tx_spillover;
- 	bool dma_pending;
+ 	unsigned int dma_pending;
  };
  
  static inline u32 bcm2835_rd(struct bcm2835_spi *bs, unsigned reg)