diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-05 11:48:01 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-05 11:48:01 +1000 |
commit | dc31a159e200fe45681206e5d099a55f147baf85 (patch) | |
tree | 0d23a4c15fe27b98cbfc39b4a3bf64afb2864e1e /Documentation | |
parent | ac30e508ae320b624b32630ada1146bd658ef04e (diff) | |
parent | 7b777942af148e5333d03440f46366b7bc543cfc (diff) |
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
drivers/cpuidle/Kconfig.arm
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/power/opp.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Documentation/power/opp.txt b/Documentation/power/opp.txt index a9adad828cdc..c6279c2be47c 100644 --- a/Documentation/power/opp.txt +++ b/Documentation/power/opp.txt @@ -51,9 +51,6 @@ Typical usage of the OPP library is as follows: SoC framework -> modifies on required cases certain OPPs -> OPP layer -> queries to search/retrieve information -> -Architectures that provide a SoC framework for OPP should select ARCH_HAS_OPP -to make the OPP layer available. - OPP layer expects each domain to be represented by a unique device pointer. SoC framework registers a set of initial OPPs per device with the OPP layer. This list is expected to be an optimally small number typically around 5 per device. |