diff --git a/[refs] b/[refs]
index 770da04dce6a..1c87ec1ae6b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0da0ead90122578ef6e4afba9ba4bcd3455fd8e8
+refs/heads/master: 54eee4c5bf553ad54ba200d00487b61eb6b155f6
diff --git a/trunk/Documentation/power/pci.txt b/trunk/Documentation/power/pci.txt
index b6a3cbf7e846..e00b099a4b86 100644
--- a/trunk/Documentation/power/pci.txt
+++ b/trunk/Documentation/power/pci.txt
@@ -203,7 +203,7 @@ resume
 
 Usage:
 
-if (dev->driver && dev->driver->suspend)
+if (dev->driver && dev->driver->resume)
 	dev->driver->resume(dev)
 
 The resume callback may be called from any power state, and is always meant to