diff --git a/[refs] b/[refs]
index b406f9332ed6..796596a59ad6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcd8db002f784706e9aa190d0b6350f868e61c32
+refs/heads/master: 8a0ba4e0178f4d87445b5527bfefdd5437b974c6
diff --git a/trunk/Documentation/rtc.txt b/trunk/Documentation/rtc.txt
index e20b19c1b60d..804a7cf6bd12 100644
--- a/trunk/Documentation/rtc.txt
+++ b/trunk/Documentation/rtc.txt
@@ -182,8 +182,8 @@ driver returns ENOIOCTLCMD.  Some common examples:
 	since the frequency is stored in the irq_freq member of the rtc_device
 	structure.  Your driver needs to initialize the irq_freq member during
 	init.  Make sure you check the requested frequency is in range of your
-	hardware in the irq_set_freq function.  If you cannot actually change
-	the frequency, just return -ENOTTY.
+	hardware in the irq_set_freq function.  If it isn't, return -EINVAL.  If
+	you cannot actually change the frequency, do not define irq_set_freq.
 
 If all else fails, check out the rtc-test.c driver!