Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / include / linux / sysfs.h

diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index 27bad59..37fa241 100644 (file)
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -101,6 +101,9 @@ void sysfs_remove_bin_file(struct kobject *kobj, struct bin_attribute *attr);
 
 int __must_check sysfs_create_link(struct kobject *kobj, struct kobject *target,
                                   const char *name);
+int __must_check sysfs_create_link_nowarn(struct kobject *kobj,
+                                         struct kobject *target,
+                                         const char *name);
 void sysfs_remove_link(struct kobject *kobj, const char *name);
 
 int __must_check sysfs_create_group(struct kobject *kobj,
@@ -180,18 +183,19 @@ static inline int sysfs_create_link(struct kobject *kobj,
        return 0;
 }
 
-static inline void sysfs_remove_link(struct kobject *kobj, const char *name)
+static inline int sysfs_create_link_nowarn(struct kobject *kobj,
+                                          struct kobject *target,
+                                          const char *name)
 {
+       return 0;
 }
 
-static inline int sysfs_create_group(struct kobject *kobj,
-                                    const struct attribute_group *grp)
+static inline void sysfs_remove_link(struct kobject *kobj, const char *name)
 {
-       return 0;
 }
 
-static inline int sysfs_update_group(struct kobject *kobj,
-                               const struct attribute_group *grp)
+static inline int sysfs_create_group(struct kobject *kobj,
+                                    const struct attribute_group *grp)
 {
        return 0;
 }