diff --git a/[refs] b/[refs] index 5116c740ffa3..94a5a8eef9d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c4945b0d8ce682eb58b82138aaf4ca2e32b0b757 +refs/heads/master: 6fd69dc578fa0b1bbc3aad70ae3af9a137211707 diff --git a/trunk/include/linux/sysfs.h b/trunk/include/linux/sysfs.h index 8bf06b64487c..3c92121ba9af 100644 --- a/trunk/include/linux/sysfs.h +++ b/trunk/include/linux/sysfs.h @@ -22,14 +22,8 @@ struct kobject; struct module; enum kobj_ns_type; -/* FIXME - * The *owner field is no longer used. - * x86 tree has been cleaned up. The owner - * attribute is still left for other arches. - */ struct attribute { const char *name; - struct module *owner; mode_t mode; #ifdef CONFIG_DEBUG_LOCK_ALLOC struct lock_class_key *key;