aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 08:49:10 -0400
committerMark Brown <broonie@linaro.org>2013-09-01 08:49:10 -0400
commit874915ed4b88fd616e6aa635bea163a470e98219 (patch)
tree378c3334b4081a4605b90bb18483d77b6735ed01 /drivers/spi
parent2dc745b6ef6d72cec863e93554df9108061c6ffd (diff)
parent8e76fda3e1ea73bc47189ebc49d4228ec86fb1fa (diff)
Merge remote-tracking branch 'spi/topic/sh-hspi' into spi-next
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-sh-hspi.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/spi/spi-sh-hspi.c b/drivers/spi/spi-sh-hspi.c
index b95d6a9fb80e..0b68cb592fa4 100644
--- a/drivers/spi/spi-sh-hspi.c
+++ b/drivers/spi/spi-sh-hspi.c
@@ -311,8 +311,6 @@ static int hspi_probe(struct platform_device *pdev)
311 311
312 pm_runtime_enable(&pdev->dev); 312 pm_runtime_enable(&pdev->dev);
313 313
314 dev_info(&pdev->dev, "probed\n");
315
316 return 0; 314 return 0;
317 315
318 error1: 316 error1: