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"

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;