Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus

[firefly-linux-kernel-4.4.55.git] / include / linux / spi / spi_bitbang.h

diff --git a/include/linux/spi/spi_bitbang.h b/include/linux/spi/spi_bitbang.h
index 2e8c048b9b80f9bf539c96a7dcf12a5d86bad27f..b8db32cea1de535c4762abd9feabc82db8384381 100644 (file)
--- a/include/linux/spi/spi_bitbang.h
+++ b/include/linux/spi/spi_bitbang.h
@@ -25,8 +25,8 @@ struct spi_bitbang {
        spinlock_t              lock;
        struct list_head        queue;
        u8                      busy;
-       u8                      shutdown;
        u8                      use_dma;
+       u8                      flags;          /* extra spi->mode support */
 
        struct spi_master       *master;