diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-27 19:54:29 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-27 19:54:29 -0400 |
commit | 355c63e5ac963af0ac95e72b74693cfe2527a76b (patch) | |
tree | cbec948ce4257c0d3a71ad9fecde5c0a64d51927 /drivers/base | |
parent | 0acaab5367a2c4140bd965a0ad3ea265af4d43ed (diff) | |
parent | cd787b345e82f7ea9c29d22c50cca29fadc53d76 (diff) |
Merge branch 'pm-assorted'
* pm-assorted:
PM / OPP: add documentation to RCU head in struct opp
PM / sleep: invalidate TEST_CPUS and TEST_CORE support for freeze state
PM / sleep: add TEST_PLATFORM support for freeze state
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/power/opp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c index 32ee0fc7ea54..f0077cb8e249 100644 --- a/drivers/base/power/opp.c +++ b/drivers/base/power/opp.c | |||
@@ -55,6 +55,7 @@ | |||
55 | * @rate: Frequency in hertz | 55 | * @rate: Frequency in hertz |
56 | * @u_volt: Nominal voltage in microvolts corresponding to this OPP | 56 | * @u_volt: Nominal voltage in microvolts corresponding to this OPP |
57 | * @dev_opp: points back to the device_opp struct this opp belongs to | 57 | * @dev_opp: points back to the device_opp struct this opp belongs to |
58 | * @head: RCU callback head used for deferred freeing | ||
58 | * | 59 | * |
59 | * This structure stores the OPP information for a given device. | 60 | * This structure stores the OPP information for a given device. |
60 | */ | 61 | */ |