Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

[~andy/linux] / drivers / base / platform.c

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index f8071976fe07591c0def1cb2a8d4de18d94b219d..2b8755db76c6e65f48b7784cb463d6a213238453 100644 (file)
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -275,7 +275,7 @@ int platform_device_add(struct platform_device *pdev)
        pr_debug("Registering platform device '%s'. Parent at %s\n",
                 pdev->dev.bus_id, pdev->dev.parent->bus_id);
 
-       ret = device_register(&pdev->dev);
+       ret = device_add(&pdev->dev);
        if (ret == 0)
                return ret;