aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/pm.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/pm.txt')
-rw-r--r--Documentation/pm.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/pm.txt b/Documentation/pm.txt
index 79c0f32a760e..da8589a0e07d 100644
--- a/Documentation/pm.txt
+++ b/Documentation/pm.txt
@@ -18,10 +18,10 @@ enabled by default). If a working ACPI implementation is found, the
18ACPI driver will override and disable APM, otherwise the APM driver 18ACPI driver will override and disable APM, otherwise the APM driver
19will be used. 19will be used.
20 20
21No sorry, you can not have both ACPI and APM enabled and running at 21No, sorry, you cannot have both ACPI and APM enabled and running at
22once. Some people with broken ACPI or broken APM implementations 22once. Some people with broken ACPI or broken APM implementations
23would like to use both to get a full set of working features, but you 23would like to use both to get a full set of working features, but you
24simply can not mix and match the two. Only one power management 24simply cannot mix and match the two. Only one power management
25interface can be in control of the machine at once. Think about it.. 25interface can be in control of the machine at once. Think about it..
26 26
27User-space Daemons 27User-space Daemons
@@ -106,7 +106,7 @@ void pm_unregister_all(pm_callback cback);
106 * 106 *
107 * Returns: 0 if the request is successful 107 * Returns: 0 if the request is successful
108 * EINVAL if the request is not supported 108 * EINVAL if the request is not supported
109 * EBUSY if the device is now busy and can not handle the request 109 * EBUSY if the device is now busy and cannot handle the request
110 * ENOMEM if the device was unable to handle the request due to memory 110 * ENOMEM if the device was unable to handle the request due to memory
111 * 111 *
112 * Details: The device request callback will be called before the 112 * Details: The device request callback will be called before the