aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/platform.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2009-08-16 05:50:10 -0400
committerRafael J. Wysocki <rjw@sisk.pl>2009-08-16 05:50:10 -0400
commit3e2bcad89814030ad6a369a97ad1481fd35938d3 (patch)
tree8d6b9b163dc9ed44ec377ca5b57be1a1fb80f923 /drivers/base/platform.c
parentdcbf77cac640af0ab944d5cbb07934bf6708b4d9 (diff)
parentb2add73dbf93fd50f00564d7abc3e2b9aa9dd20c (diff)
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/base/platform.c')
-rw-r--r--drivers/base/platform.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index ae5c4aa6d269..d28c289e4a3f 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -483,9 +483,6 @@ int platform_driver_register(struct platform_driver *drv)
483 drv->driver.remove = platform_drv_remove; 483 drv->driver.remove = platform_drv_remove;
484 if (drv->shutdown) 484 if (drv->shutdown)
485 drv->driver.shutdown = platform_drv_shutdown; 485 drv->driver.shutdown = platform_drv_shutdown;
486 if (drv->suspend || drv->resume)
487 pr_warning("Platform driver '%s' needs updating - please use "
488 "dev_pm_ops\n", drv->driver.name);
489 486
490 return driver_register(&drv->driver); 487 return driver_register(&drv->driver);
491} 488}