2 files changed, 46 insertions, 39 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 7164d4e4136b..533199bdb92a 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -217,20 +217,47 @@ and is between 256 and 4096 characters. It is defined in the file
         acpi.debug_level=       [HW,ACPI]
                         Format: <int>
                         Each bit of the <int> indicates an ACPI debug level,
-                        1: enable, 0: disable. It is useful for boot time
-                        debugging. After system has booted up, it can be set
-                        via /sys/module/acpi/parameters/debug_level.
-                        CONFIG_ACPI_DEBUG must be enabled for this to produce any output.
-                        Available bits (add the numbers together) to enable different
-                        debug output levels of the ACPI subsystem:
-                        0x01 error 0x02 warn 0x04 init 0x08 debug object
-                        0x10 info 0x20 init names 0x40 parse 0x80 load
-                        0x100 dispatch 0x200 execute 0x400 names 0x800 operation region
-                        0x1000 bfield 0x2000 tables 0x4000 values 0x8000 objects
-                        0x10000 resources 0x20000 user requests 0x40000 package.
-                        The number can be in decimal or prefixed with 0x in hex.
-                        Warning: Many of these options can produce a lot of
-                        output and make your system unusable. Be very careful.
+                        which corresponds to the level in an ACPI_DEBUG_PRINT
+                        statement.  After system has booted up, this mask
+                        can be set via /sys/module/acpi/parameters/debug_level.
+
+                        CONFIG_ACPI_DEBUG must be enabled for this to produce
+                        any output.  The number can be in decimal or prefixed
+                        with 0x in hex.  Some of these options produce so much
+                        output that the system is unusable.
+
+                        The following global components are defined by the
+                        ACPI CA:
+                               0x01 error
+                               0x02 warn
+                               0x04 init
+                               0x08 debug object
+                               0x10 info
+                               0x20 init names
+                               0x40 parse
+                               0x80 load
+                              0x100 dispatch
+                              0x200 execute
+                              0x400 names
+                              0x800 operation region
+                             0x1000 bfield
+                             0x2000 tables
+                             0x4000 values
+                             0x8000 objects
+                            0x10000 resources
+                            0x20000 user requests
+                            0x40000 package
+                        The number can be in decimal or prefixed with 0x in hex.
+                        Warning: Many of these options can produce a lot of
+                        output and make your system unusable. Be very careful.
+
+        acpi.power_nocheck=     [HW,ACPI]
+                        Format: 1/0 enable/disable the check of power state.
+                        On some bogus BIOS the _PSC object/_STA object of
+                        power resource can't return the correct device power
+                        state. In such case it is unneccessary to check its
+                        power state again in power transition.
+                        1 : disable the power state check
 
         acpi_pm_good    [X86-32,X86-64]
                         Override the pmtimer bug detection: force the kernel
@@ -2150,7 +2177,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
         thermal.crt=    [HW,ACPI]
                         -1: disable all critical trip points in all thermal zones
-                        <degrees C>: lower all critical trip points
+                        <degrees C>: override all critical trip points
 
         thermal.nocrt=  [HW,ACPI]
                         Set to disable actions on ACPI thermal zone
diff --git a/Documentation/laptops/acer-wmi.txt b/Documentation/laptops/acer-wmi.txt
index 69b5dd4e5a59..2b3a6b5260bf 100644
--- a/Documentation/laptops/acer-wmi.txt
+++ b/Documentation/laptops/acer-wmi.txt
@@ -1,7 +1,7 @@
 Acer Laptop WMI Extras Driver
 http://code.google.com/p/aceracpi
-Version 0.1
-9th February 2008
+Version 0.2
+18th August 2008
 
 Copyright 2007-2008 Carlos Corbacho <carlos@strangeworlds.co.uk>
 
@@ -87,17 +87,7 @@ acer-wmi come with built-in wireless. However, should you feel so inclined to
 ever wish to remove the card, or swap it out at some point, please get in touch
 with me, as we may well be able to gain some data on wireless card detection.
 
-To read the status of the wireless radio (0=off, 1=on):
-cat /sys/devices/platform/acer-wmi/wireless
-
-To enable the wireless radio:
-echo 1 > /sys/devices/platform/acer-wmi/wireless
-
-To disable the wireless radio:
-echo 0 > /sys/devices/platform/acer-wmi/wireless
-
-To set the state of the wireless radio when loading acer-wmi, pass:
-wireless=X (where X is 0 or 1)
+The wireless radio is exposed through rfkill.
 
 Bluetooth
 *********
@@ -117,17 +107,7 @@ For the adventurously minded - if you want to buy an internal bluetooth
 module off the internet that is compatible with your laptop and fit it, then
 it will work just fine with acer-wmi.
 
-To read the status of the bluetooth module (0=off, 1=on):
-cat /sys/devices/platform/acer-wmi/wireless
-
-To enable the bluetooth module:
-echo 1 > /sys/devices/platform/acer-wmi/bluetooth
-
-To disable the bluetooth module:
-echo 0 > /sys/devices/platform/acer-wmi/bluetooth
-
-To set the state of the bluetooth module when loading acer-wmi, pass:
-bluetooth=X (where X is 0 or 1)
+Bluetooth is exposed through rfkill.
 
 3G
 **