diff --git a/[refs] b/[refs]
index 254e9df3c2f5..86d12d1f135e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55ff9780e7cedc9168dab4d42483c70011c53ace
+refs/heads/master: a42dc9d4804cc5e111952008492dae9d34c6a541
diff --git a/trunk/drivers/video/skeletonfb.c b/trunk/drivers/video/skeletonfb.c
index 9fda5b5d64dd..7a7ed7dbe326 100644
--- a/trunk/drivers/video/skeletonfb.c
+++ b/trunk/drivers/video/skeletonfb.c
@@ -959,11 +959,11 @@ static int xxxfb_suspend(struct platform_device *dev, pm_message_t msg)
 
 /**
  *	xxxfb_resume - Optional but recommended function. Resume the device.
- *	@dev: PCI device
+ *	@dev: platform device
  *
  *      See Documentation/power/devices.txt for more information
  */
-static int xxxfb_suspend(struct platform_dev *dev)
+static int xxxfb_resume(struct platform_dev *dev)
 {
 	struct fb_info *info = platform_get_drvdata(dev);
 	struct xxxfb_par *par = info->par;