summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-txx9.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-25 12:51:36 +0400
committerMark Brown <broonie@linaro.org>2013-10-25 12:51:36 +0400
commit982d6287435afb2cbd05bcabe1392658e20e613c (patch)
tree55ef7b68a696a5bd2d1c1bbe0f2919d3a6bdad28 /drivers/spi/spi-txx9.c
parent7e0ae74090a46663b0a650e9e70aea74cc737cf2 (diff)
parent1d82d0c2682ec88a84aaae40c830bddf6ab09482 (diff)
downloadlinux-982d6287435afb2cbd05bcabe1392658e20e613c.tar.xz
Merge remote-tracking branch 'spi/topic/probe' into spi-next
Diffstat (limited to 'drivers/spi/spi-txx9.c')
-rw-r--r--drivers/spi/spi-txx9.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-txx9.c b/drivers/spi/spi-txx9.c
index 69eb88627d40..1937be437246 100644
--- a/drivers/spi/spi-txx9.c
+++ b/drivers/spi/spi-txx9.c
@@ -438,6 +438,7 @@ static int txx9spi_remove(struct platform_device *dev)
MODULE_ALIAS("platform:spi_txx9");
static struct platform_driver txx9spi_driver = {
+ .probe = txx9spi_probe,
.remove = txx9spi_remove,
.driver = {
.name = "spi_txx9",
@@ -447,7 +448,7 @@ static struct platform_driver txx9spi_driver = {
static int __init txx9spi_init(void)
{
- return platform_driver_probe(&txx9spi_driver, txx9spi_probe);
+ return platform_driver_register(&txx9spi_driver);
}
subsys_initcall(txx9spi_init);