diff options
| author | Len Brown <len.brown@intel.com> | 2008-11-11 21:13:50 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-11-11 21:13:50 -0500 |
| commit | 597e4fabb0b0c7fdfa7c2d551fd0a797aab7e53b (patch) | |
| tree | 2864bd6b9a5919698bc497892927849fed53618a /Documentation | |
| parent | 3ad4f597058301c97f362e500a32f63f5c950a45 (diff) | |
| parent | ed206fac87d65917280b6c3edd3f01125d4095c9 (diff) | |
| download | linux-597e4fabb0b0c7fdfa7c2d551fd0a797aab7e53b.tar.gz linux-597e4fabb0b0c7fdfa7c2d551fd0a797aab7e53b.tar.bz2 linux-597e4fabb0b0c7fdfa7c2d551fd0a797aab7e53b.zip | |
Merge branch 'bugzilla-11312' into release
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/ABI/testing/sysfs-firmware-acpi | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/ABI/testing/sysfs-firmware-acpi b/Documentation/ABI/testing/sysfs-firmware-acpi index f27be7d1a49f..e8ffc70ffe12 100644 --- a/Documentation/ABI/testing/sysfs-firmware-acpi +++ b/Documentation/ABI/testing/sysfs-firmware-acpi @@ -89,7 +89,7 @@ Description: error - an interrupt that can't be accounted for above. - invalid: it's either a wakeup GPE or a GPE/Fixed Event that + invalid: it's either a GPE or a Fixed Event that doesn't have an event handler. disable: the GPE/Fixed Event is valid but disabled. @@ -117,30 +117,30 @@ Description: and other user space applications so that the machine won't shutdown when pressing the power button. # cat ff_pwr_btn - 0 + 0 enabled # press the power button for 3 times; # cat ff_pwr_btn - 3 + 3 enabled # echo disable > ff_pwr_btn # cat ff_pwr_btn - disable + 3 disabled # press the power button for 3 times; # cat ff_pwr_btn - disable + 3 disabled # echo enable > ff_pwr_btn # cat ff_pwr_btn - 4 + 4 enabled /* * this is because the status bit is set even if the enable bit is cleared, * and it triggers an ACPI fixed event when the enable bit is set again */ # press the power button for 3 times; # cat ff_pwr_btn - 7 + 7 enabled # echo disable > ff_pwr_btn # press the power button for 3 times; # echo clear > ff_pwr_btn /* clear the status bit */ # echo disable > ff_pwr_btn # cat ff_pwr_btn - 7 + 7 enabled |