Merge branch 'for-4.20' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Thu, 29 Nov 2018 16:23:39 +0000 (16:23 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 29 Nov 2018 16:23:39 +0000 (16:23 +0000)
1  2 
drivers/spi/spi-bcm2835.c

index 232002db26966faa452e3f376cde58f6f51e0304,25abf2d1732a0b69e48a89bc8e9250db0fe82299..5cbdc94bb4cfd96fe1c53943b64966a079a478ac
@@@ -106,10 -88,7 +106,10 @@@ struct bcm2835_spi 
        u8 *rx_buf;
        int tx_len;
        int rx_len;
-       bool dma_pending;
 +      int tx_prologue;
 +      int rx_prologue;
 +      bool tx_spillover;
+       unsigned int dma_pending;
  };
  
  static inline u32 bcm2835_rd(struct bcm2835_spi *bs, unsigned reg)