Merge branch 'for-4.20' of...

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

drivers/spi/spi-bcm2835.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -109,7 +109,7 @@ struct bcm2835_spi {
		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)