Merge branch 'master' into for-linus

This commit is contained in:
Rafael J. Wysocki 2009-08-16 11:50:10 +02:00
commit 3e2bcad898
167 changed files with 1656 additions and 864 deletions

View file

@ -483,9 +483,6 @@ int platform_driver_register(struct platform_driver *drv)
drv->driver.remove = platform_drv_remove;
if (drv->shutdown)
drv->driver.shutdown = platform_drv_shutdown;
if (drv->suspend || drv->resume)
pr_warning("Platform driver '%s' needs updating - please use "
"dev_pm_ops\n", drv->driver.name);
return driver_register(&drv->driver);
}