diff --git a/[refs] b/[refs]
index 8fdca6cf49f4..3a4e73b12414 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d92e8f3ae9ba21cac30370eb254ed9dc20df043
+refs/heads/master: 245127dbe9ea1e5a93aae0d3ede09992f1e99f53
diff --git a/trunk/Documentation/driver-model/device.txt b/trunk/Documentation/driver-model/device.txt
index a05ec50f8004..a7cbfff40d07 100644
--- a/trunk/Documentation/driver-model/device.txt
+++ b/trunk/Documentation/driver-model/device.txt
@@ -127,9 +127,11 @@ void unlock_device(struct device * dev);
 Attributes
 ~~~~~~~~~~
 struct device_attribute {
-        struct attribute        attr;
-        ssize_t (*show)(struct device * dev, char * buf, size_t count, loff_t off);
-        ssize_t (*store)(struct device * dev, const char * buf, size_t count, loff_t off);
+	struct attribute	attr;
+	ssize_t (*show)(struct device *dev, struct device_attribute *attr,
+			char *buf);
+	ssize_t (*store)(struct device *dev, struct device_attribute *attr,
+			 const char *buf, size_t count);
 };
 
 Attributes of devices can be exported via drivers using a simple