diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-25 04:51:21 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-25 04:51:21 -0400 |
| commit | 2ef2e60d2f4d470b0cb591baeaf942316c0673ed (patch) | |
| tree | d70316198ee16e96d84d75ddcb5e7d74124b1efd /drivers/spi/spi-fsl-cpm.c | |
| parent | c55b869ac49587290f24cb5c8a4e7023c90dfb3f (diff) | |
| parent | 543c954d6807ad0682c37846b7b9c423cd941415 (diff) | |
Merge remote-tracking branch 'spi/topic/atmel' into spi-next
Diffstat (limited to 'drivers/spi/spi-fsl-cpm.c')
| -rw-r--r-- | drivers/spi/spi-fsl-cpm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-fsl-cpm.c b/drivers/spi/spi-fsl-cpm.c index 07971e3fe58b..58630edb8c21 100644 --- a/drivers/spi/spi-fsl-cpm.c +++ b/drivers/spi/spi-fsl-cpm.c | |||
| @@ -299,7 +299,7 @@ int fsl_spi_cpm_init(struct mpc8xxx_spi *mspi) | |||
| 299 | 299 | ||
| 300 | switch (mspi->subblock) { | 300 | switch (mspi->subblock) { |
| 301 | default: | 301 | default: |
| 302 | dev_warn(dev, "cell-index unspecified, assuming SPI1"); | 302 | dev_warn(dev, "cell-index unspecified, assuming SPI1\n"); |
| 303 | /* fall through */ | 303 | /* fall through */ |
| 304 | case 0: | 304 | case 0: |
| 305 | mspi->subblock = QE_CR_SUBBLOCK_SPI1; | 305 | mspi->subblock = QE_CR_SUBBLOCK_SPI1; |