diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 02:10:07 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 02:10:07 -0400 |
| commit | e14eee56c2280953c6e3d24d5dce42bd90836b81 (patch) | |
| tree | 21ab792d9ad6fbbab460058f352a0158f995644e /Documentation/driver-model/device.txt | |
| parent | d6ee6f7e4c74d9a0fed7544f4d389bde004651d3 (diff) | |
| parent | 99adcd9d67aaf04e28f5ae96df280f236bde4b66 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'Documentation/driver-model/device.txt')
| -rw-r--r-- | Documentation/driver-model/device.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/driver-model/device.txt b/Documentation/driver-model/device.txt index a05ec50f8004..a7cbfff40d07 100644 --- a/Documentation/driver-model/device.txt +++ b/Documentation/driver-model/device.txt | |||
| @@ -127,9 +127,11 @@ void unlock_device(struct device * dev); | |||
| 127 | Attributes | 127 | Attributes |
| 128 | ~~~~~~~~~~ | 128 | ~~~~~~~~~~ |
| 129 | struct device_attribute { | 129 | struct device_attribute { |
| 130 | struct attribute attr; | 130 | struct attribute attr; |
| 131 | ssize_t (*show)(struct device * dev, char * buf, size_t count, loff_t off); | 131 | ssize_t (*show)(struct device *dev, struct device_attribute *attr, |
| 132 | ssize_t (*store)(struct device * dev, const char * buf, size_t count, loff_t off); | 132 | char *buf); |
| 133 | ssize_t (*store)(struct device *dev, struct device_attribute *attr, | ||
| 134 | const char *buf, size_t count); | ||
| 133 | }; | 135 | }; |
| 134 | 136 | ||
| 135 | Attributes of devices can be exported via drivers using a simple | 137 | Attributes of devices can be exported via drivers using a simple |