mm/memory-failure.c: move set_migratetype_isolate() outside get_any_page()

[firefly-linux-kernel-4.4.55.git] / drivers / spi / spi-fsl-cpm.c

diff --git a/drivers/spi/spi-fsl-cpm.c b/drivers/spi/spi-fsl-cpm.c
index 07971e3fe58b63c23daab2bb7cea0a3350a6bb6a..54b06376f03c9e34b3d5863ffa814263455d904c 100644 (file)
--- a/drivers/spi/spi-fsl-cpm.c
+++ b/drivers/spi/spi-fsl-cpm.c
@@ -20,6 +20,7 @@
 #include <linux/spi/spi.h>
 #include <linux/fsl_devices.h>
 #include <linux/dma-mapping.h>
+#include <linux/of_address.h>
 #include <asm/cpm.h>
 #include <asm/qe.h>
 
@@ -299,7 +300,7 @@ int fsl_spi_cpm_init(struct mpc8xxx_spi *mspi)
 
                switch (mspi->subblock) {
                default:
-                       dev_warn(dev, "cell-index unspecified, assuming SPI1");
+                       dev_warn(dev, "cell-index unspecified, assuming SPI1\n");
                        /* fall through */
                case 0:
                        mspi->subblock = QE_CR_SUBBLOCK_SPI1;