Merge branch 'parisc-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[cascardo/linux.git] / drivers / spi / spi-fsl-lib.h

diff --git a/drivers/spi/spi-fsl-lib.h b/drivers/spi/spi-fsl-lib.h
index 84f5dcb..2925c80 100644 (file)
--- a/drivers/spi/spi-fsl-lib.h
+++ b/drivers/spi/spi-fsl-lib.h
@@ -23,13 +23,14 @@
 /* SPI/eSPI Controller driver's private data. */
 struct mpc8xxx_spi {
        struct device *dev;
-       void *reg_base;
+       void __iomem *reg_base;
 
        /* rx & tx bufs from the spi_transfer */
        const void *tx;
        void *rx;
 #if IS_ENABLED(CONFIG_SPI_FSL_ESPI)
        int len;
+       u8 *local_buf;
 #endif
 
        int subblock;