summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-au1550.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-25 09:51:36 +0100
committerMark Brown <broonie@linaro.org>2013-10-25 09:51:36 +0100
commit982d6287435afb2cbd05bcabe1392658e20e613c (patch)
tree55ef7b68a696a5bd2d1c1bbe0f2919d3a6bdad28 /drivers/spi/spi-au1550.c
parent7e0ae74090a46663b0a650e9e70aea74cc737cf2 (diff)
parent1d82d0c2682ec88a84aaae40c830bddf6ab09482 (diff)
downloadlinux-982d6287435afb2cbd05bcabe1392658e20e613c.tar.bz2
Merge remote-tracking branch 'spi/topic/probe' into spi-next
Diffstat (limited to 'drivers/spi/spi-au1550.c')
-rw-r--r--drivers/spi/spi-au1550.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-au1550.c b/drivers/spi/spi-au1550.c
index e06400a3a719..c4141c92bcff 100644
--- a/drivers/spi/spi-au1550.c
+++ b/drivers/spi/spi-au1550.c
@@ -985,6 +985,7 @@ static int au1550_spi_remove(struct platform_device *pdev)
MODULE_ALIAS("platform:au1550-spi");
static struct platform_driver au1550_spi_drv = {
+ .probe = au1550_spi_probe,
.remove = au1550_spi_remove,
.driver = {
.name = "au1550-spi",
@@ -1004,7 +1005,7 @@ static int __init au1550_spi_init(void)
printk(KERN_ERR "au1550-spi: cannot add memory"
"dbdma device\n");
}
- return platform_driver_probe(&au1550_spi_drv, au1550_spi_probe);
+ return platform_driver_register(&au1550_spi_drv);
}
module_init(au1550_spi_init);