Merge branch 'linux-2.6' into merge

[linux-2.6-omap-h63xx.git] / drivers / spi / spi_txx9.c

diff --git a/drivers/spi/spi_txx9.c b/drivers/spi/spi_txx9.c
index 08e981c40646810dd5de12ae1d03026b636374cb..cc5094f37dd3d71a791df96efa58c374d8d68137 100644 (file)
--- a/drivers/spi/spi_txx9.c
+++ b/drivers/spi/spi_txx9.c
@@ -400,7 +400,7 @@ static int __init txx9spi_probe(struct platform_device *dev)
                goto exit;
        }
 
-       c->workqueue = create_singlethread_workqueue(master->cdev.dev->bus_id);
+       c->workqueue = create_singlethread_workqueue(master->dev.parent->bus_id);
        if (!c->workqueue)
                goto exit;
        c->last_chipselect = -1;
@@ -453,7 +453,7 @@ static int __exit txx9spi_remove(struct platform_device *dev)
 static struct platform_driver txx9spi_driver = {
        .remove = __exit_p(txx9spi_remove),
        .driver = {
-               .name = "txx9spi",
+               .name = "spi_txx9",
                .owner = THIS_MODULE,
        },
 };