diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-05 11:47:01 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-05 11:47:01 +0200 |
| commit | 40a2bc5b5c03c7219f40be1f5be51089a156b974 (patch) | |
| tree | b0f7a9bbf7b64727a0f1b35f70ead1a4d2809736 /c10.patch | |
| parent | 7d9e0d94f09501482a336a7a2e692c159ec4c9a9 (diff) | |
| download | patches-40a2bc5b5c03c7219f40be1f5be51089a156b974.tar.gz | |
refresh and move some patches out of the main queue
Diffstat (limited to 'c10.patch')
| -rw-r--r-- | c10.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/c10.patch b/c10.patch deleted file mode 100644 index f55fd6edc0bff7..00000000000000 --- a/c10.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- - arch/avr32/boards/merisc/merisc_sysfs.c | 17 ++++++++++------- - 1 file changed, 10 insertions(+), 7 deletions(-) - ---- a/arch/avr32/boards/merisc/merisc_sysfs.c -+++ b/arch/avr32/boards/merisc/merisc_sysfs.c -@@ -18,7 +18,7 @@ - #include <linux/ctype.h> - #include "merisc.h" - --static ssize_t merisc_model_show(struct class *class, char *buf) -+static ssize_t model_show(struct class *class, char *buf) - { - ssize_t ret = 0; - -@@ -27,8 +27,9 @@ static ssize_t merisc_model_show(struct - - return ret; - } -+static CLASS_ATTR_RO(model); - --static ssize_t merisc_revision_show(struct class *class, char *buf) -+static ssize_t revision_show(struct class *class, char *buf) - { - ssize_t ret = 0; - -@@ -37,17 +38,19 @@ static ssize_t merisc_revision_show(stru - - return ret; - } -+static CLASS_ATTR_RO(revision); - --static struct class_attribute merisc_class_attrs[] = { -- __ATTR(model, S_IRUGO, merisc_model_show, NULL), -- __ATTR(revision, S_IRUGO, merisc_revision_show, NULL), -- __ATTR_NULL, -+static struct attribute *merisc_class_attrs[] = { -+ &class_attr_model.attr, -+ &class_attr_revision.attr, -+ NULL, - }; -+ATTRIBUTE_GROUPS(merisc_class); - - struct class merisc_class = { - .name = "merisc", - .owner = THIS_MODULE, -- .class_attrs = merisc_class_attrs, -+ .class_groups = merisc_class_groups, - }; - - static int __init merisc_sysfs_init(void) |