diff --git a/[refs] b/[refs]
index 543ea9e13352..793c8dae7b26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85dfd81dc57e8183a277ddd7a56aa65c96f3f487
+refs/heads/master: 651b1f125c7e3806bbd635739d009433dc07372d
diff --git a/trunk/drivers/base/platform.c b/trunk/drivers/base/platform.c
index 81cb01bfc356..456594bd97bc 100644
--- a/trunk/drivers/base/platform.c
+++ b/trunk/drivers/base/platform.c
@@ -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);
 }