diff options
| author | Mark Brown | 2013-10-25 10:51:36 +0200 |
|---|---|---|
| committer | Mark Brown | 2013-10-25 10:51:36 +0200 |
| commit | 982d6287435afb2cbd05bcabe1392658e20e613c (patch) | |
| tree | 55ef7b68a696a5bd2d1c1bbe0f2919d3a6bdad28 /drivers/spi/spi-txx9.c | |
| parent | Merge remote-tracking branch 'spi/topic/pl022' into spi-next (diff) | |
| parent | spi: spi-txx9: replace platform_driver_probe to support deferred probing (diff) | |
| download | kernel-qcow2-linux-982d6287435afb2cbd05bcabe1392658e20e613c.tar.gz kernel-qcow2-linux-982d6287435afb2cbd05bcabe1392658e20e613c.tar.xz kernel-qcow2-linux-982d6287435afb2cbd05bcabe1392658e20e613c.zip | |
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.c | 3 |
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); |