diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-25 09:51:21 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-25 09:51:21 +0100 |
| commit | 2ef2e60d2f4d470b0cb591baeaf942316c0673ed (patch) | |
| tree | d70316198ee16e96d84d75ddcb5e7d74124b1efd /drivers/spi/spi-mpc52xx-psc.c | |
| parent | c55b869ac49587290f24cb5c8a4e7023c90dfb3f (diff) | |
| parent | 543c954d6807ad0682c37846b7b9c423cd941415 (diff) | |
Merge remote-tracking branch 'spi/topic/atmel' into spi-next
Diffstat (limited to 'drivers/spi/spi-mpc52xx-psc.c')
| -rw-r--r-- | drivers/spi/spi-mpc52xx-psc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-mpc52xx-psc.c b/drivers/spi/spi-mpc52xx-psc.c index 6e925dc3439..00ba910ab30 100644 --- a/drivers/spi/spi-mpc52xx-psc.c +++ b/drivers/spi/spi-mpc52xx-psc.c @@ -383,8 +383,8 @@ static int mpc52xx_psc_spi_do_probe(struct device *dev, u32 regaddr, mps->irq = irq; if (pdata == NULL) { - dev_warn(dev, "probe called without platform data, no " - "cs_control function will be called\n"); + dev_warn(dev, + "probe called without platform data, no cs_control function will be called\n"); mps->cs_control = NULL; mps->sysclk = 0; master->bus_num = bus_num; |