diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 19:00:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 19:00:33 -0400 |
| commit | 1d345dac1f30af1cd9f3a1faa12f9f18f17f236e (patch) | |
| tree | 42a7deda7589edf704fe60dc262046755bd3f6a8 /drivers/w1/w1_family.h | |
| parent | fb395884576684ebb54b19b1054f4caed589d5f0 (diff) | |
| parent | 87c8a4433b608261a9becdb0ce2d2f2ed4b71d05 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/w1/w1_family.h')
| -rw-r--r-- | drivers/w1/w1_family.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/w1/w1_family.h b/drivers/w1/w1_family.h index 03a2de7a601f..07fa49412a90 100644 --- a/drivers/w1/w1_family.h +++ b/drivers/w1/w1_family.h | |||
| @@ -34,10 +34,10 @@ | |||
| 34 | 34 | ||
| 35 | struct w1_family_ops | 35 | struct w1_family_ops |
| 36 | { | 36 | { |
| 37 | ssize_t (* rname)(struct device *, char *); | 37 | ssize_t (* rname)(struct device *, struct device_attribute *, char *); |
| 38 | ssize_t (* rbin)(struct kobject *, char *, loff_t, size_t); | 38 | ssize_t (* rbin)(struct kobject *, char *, loff_t, size_t); |
| 39 | 39 | ||
| 40 | ssize_t (* rval)(struct device *, char *); | 40 | ssize_t (* rval)(struct device *, struct device_attribute *, char *); |
| 41 | unsigned char rvalname[MAXNAMELEN]; | 41 | unsigned char rvalname[MAXNAMELEN]; |
| 42 | }; | 42 | }; |
| 43 | 43 | ||