diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-10 17:02:41 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-10 17:02:41 -0700 |
| commit | e96e039272610e5716f4cccb31b7ceb9c4a4c44c (patch) | |
| tree | bfeafc2e2a602106d27bdbc53e5869422bcf8f46 /f3.patch | |
| parent | 71dc29f11ecf9b2d046caa36ae09f233b6fbcb8c (diff) | |
| download | patches-e96e039272610e5716f4cccb31b7ceb9c4a4c44c.tar.gz | |
updates
Diffstat (limited to 'f3.patch')
| -rw-r--r-- | f3.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/f3.patch b/f3.patch new file mode 100644 index 00000000000000..169d5d7933cccc --- /dev/null +++ b/f3.patch @@ -0,0 +1,32 @@ +--- + drivers/base/platform.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +--- a/drivers/base/platform.c ++++ b/drivers/base/platform.c +@@ -671,11 +671,13 @@ static ssize_t modalias_show(struct devi + + return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len; + } ++static DEVICE_ATTR_RO(modalias); + +-static struct device_attribute platform_dev_attrs[] = { +- __ATTR_RO(modalias), +- __ATTR_NULL, ++static struct attribute *platform_dev_attrs[] = { ++ &dev_attr_modalias.attr, ++ NULL, + }; ++ATTRIBUTE_GROUPS(platform_dev); + + static int platform_uevent(struct device *dev, struct kobj_uevent_env *env) + { +@@ -892,7 +894,7 @@ static const struct dev_pm_ops platform_ + + struct bus_type platform_bus_type = { + .name = "platform", +- .dev_attrs = platform_dev_attrs, ++ .dev_groups = platform_dev_groups, + .match = platform_match, + .uevent = platform_uevent, + .pm = &platform_dev_pm_ops, |