diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-01-15 12:27:20 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-15 12:27:20 -0500 |
| commit | c0106d72b8d71696dbe9dc80e2c77d4ac63f7531 (patch) | |
| tree | ca96d2baecb0555e36219ed6968dc8e306e530ca /Documentation/laptops/thinkpad-acpi.txt | |
| parent | 5852973c129cf7c7e6c229abb7250673fc2a50c9 (diff) | |
| parent | eff317d0834ad1ff03f747f6bc2d76b9a9c95160 (diff) | |
Merge branch 'topic/asoc' into next/asoc
Diffstat (limited to 'Documentation/laptops/thinkpad-acpi.txt')
| -rw-r--r-- | Documentation/laptops/thinkpad-acpi.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt index 71f0fe1fc1b0..898b4987bb80 100644 --- a/Documentation/laptops/thinkpad-acpi.txt +++ b/Documentation/laptops/thinkpad-acpi.txt | |||
| @@ -1475,7 +1475,7 @@ Sysfs interface changelog: | |||
| 1475 | 1475 | ||
| 1476 | 0x020100: Marker for thinkpad-acpi with hot key NVRAM polling | 1476 | 0x020100: Marker for thinkpad-acpi with hot key NVRAM polling |
| 1477 | support. If you must, use it to know you should not | 1477 | support. If you must, use it to know you should not |
| 1478 | start an userspace NVRAM poller (allows to detect when | 1478 | start a userspace NVRAM poller (allows to detect when |
| 1479 | NVRAM is compiled out by the user because it is | 1479 | NVRAM is compiled out by the user because it is |
| 1480 | unneeded/undesired in the first place). | 1480 | unneeded/undesired in the first place). |
| 1481 | 0x020101: Marker for thinkpad-acpi with hot key NVRAM polling | 1481 | 0x020101: Marker for thinkpad-acpi with hot key NVRAM polling |