diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-02 08:08:53 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-02 08:08:53 +0100 |
| commit | 3203ced29052a9d2a1da4ec929faceb165f0a603 (patch) | |
| tree | fa328443047d6bd612ef0cd9d7ad7c6c58efcdda /p22.patch | |
| parent | 9eec6a6c64e9195861d4b1208ff42b6807761935 (diff) | |
| download | patches-3203ced29052a9d2a1da4ec929faceb165f0a603.tar.gz | |
rtl8812ae driver is now upstream
Diffstat (limited to 'p22.patch')
| -rw-r--r-- | p22.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/p22.patch b/p22.patch index 67b19a16419870..6481df14114e42 100644 --- a/p22.patch +++ b/p22.patch @@ -36,9 +36,9 @@ }; +ATTRIBUTE_GROUPS(amba_dev); - #ifdef CONFIG_PM_SLEEP - -@@ -302,7 +300,7 @@ static const struct dev_pm_ops amba_pm = + #ifdef CONFIG_PM_RUNTIME + /* +@@ -136,7 +134,7 @@ static const struct dev_pm_ops amba_pm = */ struct bus_type amba_bustype = { .name = "amba", @@ -46,4 +46,4 @@ + .dev_groups = amba_dev_groups, .match = amba_match, .uevent = amba_uevent, - .pm = AMBA_PM, + .pm = &amba_pm, |