Pull bugzilla-7570 into release branch

[linux-2.6] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index d1a3a27c3988fea20a71e0bcd2a8c02283ea009b..39a3199a826db2726e60475195f64f03465c5acb 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -294,8 +294,6 @@ extern void class_device_initialize(struct class_device *);
 extern int __must_check class_device_add(struct class_device *);
 extern void class_device_del(struct class_device *);
 
-extern int class_device_rename(struct class_device *, char *);
-
 extern struct class_device * class_device_get(struct class_device *);
 extern void class_device_put(struct class_device *);