diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-31 13:43:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-31 13:43:31 -0700 |
| commit | b1d08ac064268d0ae2281e98bf5e82627e0f0c56 (patch) | |
| tree | 00aec5eed543558856b7dd6f0de7dede98e6c851 /include | |
| parent | 57eb06e584be3b702d1ba5c39e0b57ddcdabdc66 (diff) | |
| parent | d919fd433b5823d1cf9d0688eb2eec183de9b74c (diff) | |
| download | linux-stable-b1d08ac064268d0ae2281e98bf5e82627e0f0c56.tar.gz linux-stable-b1d08ac064268d0ae2281e98bf5e82627e0f0c56.tar.bz2 linux-stable-b1d08ac064268d0ae2281e98bf5e82627e0f0c56.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
Revert "Driver core: remove class_device_*_bin_file"
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/device.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 2c5e49d446b8..2e15822fe409 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -291,6 +291,10 @@ extern void class_device_put(struct class_device *); extern void class_device_remove_file(struct class_device *, const struct class_device_attribute *); +extern int __must_check class_device_create_bin_file(struct class_device *, + struct bin_attribute *); +extern void class_device_remove_bin_file(struct class_device *, + struct bin_attribute *); struct class_interface { struct list_head node; |