diff --git a/[refs] b/[refs]
index 5f27a103057f..ea4c1ff8d08b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 308975fa7ab2a8e0b91186158128668c823790ce
+refs/heads/master: 909662e1e7290945fa3bca038bc3b7bb5d19499f
diff --git a/trunk/Documentation/driver-model/driver.txt b/trunk/Documentation/driver-model/driver.txt
index 82132169d47a..60120fb3b961 100644
--- a/trunk/Documentation/driver-model/driver.txt
+++ b/trunk/Documentation/driver-model/driver.txt
@@ -207,8 +207,8 @@ Attributes
 ~~~~~~~~~~
 struct driver_attribute {
         struct attribute        attr;
-        ssize_t (*show)(struct device_driver *, char * buf, size_t count, loff_t off);
-        ssize_t (*store)(struct device_driver *, const char * buf, size_t count, loff_t off);
+        ssize_t (*show)(struct device_driver *driver, char *buf);
+        ssize_t (*store)(struct device_driver *, const char * buf, size_t count);
 };
 
 Device drivers can export attributes via their sysfs directories.