Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  Merge branches 'release' and 'buildfix' into release
  acer-wmi - Add documentation
  sonypi - Move sonypi.txt to Documentation/laptops
  sony-laptop - Move sony-laptop.txt to Documentation/laptops
  thinkpad-acpi - Move thinkpad-acpi.txt to Documentation/laptops
  Documentation - Create laptops sub-directory
  ACPI: thermal: buildfix for CONFIG_THERMAL=n
  cpuidle: build fix for non-x86
  acer-wmi: Fix backlight on AMW0 (V1) laptops
  tc1100-wmi: Mark as experimental
  ACPI: SBS: Host controller must initialize before SBS.

2 files changed, 11 insertions, 8 deletions

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index c143a86c2ea6..1abc95ca9dfa 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -114,6 +114,9 @@ config ACER_WMI
           wireless radio and bluetooth control, and on some laptops,
           exposes the mail LED and LCD backlight.
 
+          For more information about this driver see
+          <file:Documentation/laptops/acer-wmi.txt>
+
           If you have an ACPI-WMI compatible Acer/ Wistron laptop, say Y or M
           here.
 
@@ -152,8 +155,9 @@ config FUJITSU_LAPTOP
           If you have a Fujitsu laptop, say Y or M here.
 
 config TC1100_WMI
-        tristate "HP Compaq TC1100 Tablet WMI Extras"
+        tristate "HP Compaq TC1100 Tablet WMI Extras (EXPERIMENTAL)"
         depends on X86 && !X86_64
+        depends on EXPERIMENTAL
         depends on ACPI
         select ACPI_WMI
         ---help---
@@ -192,7 +196,7 @@ config SONY_LAPTOP
           screen brightness control, Fn keys and allows powering on/off some
           devices.
 
-          Read <file:Documentation/sony-laptop.txt> for more information.
+          Read <file:Documentation/laptops/sony-laptop.txt> for more information.
 
 config SONYPI_COMPAT
         bool "Sonypi compatibility"
@@ -211,8 +215,9 @@ config THINKPAD_ACPI
           This is a driver for the IBM and Lenovo ThinkPad laptops. It adds
           support for Fn-Fx key combinations, Bluetooth control, video
           output switching, ThinkLight control, UltraBay eject and more.
-          For more information about this driver see 
-          <file:Documentation/thinkpad-acpi.txt> and <http://ibm-acpi.sf.net/> .
+          For more information about this driver see
+          <file:Documentation/laptops/thinkpad-acpi.txt> and
+          <http://ibm-acpi.sf.net/> .
 
           This driver was formerly known as ibm-acpi.
 
diff --git a/drivers/misc/acer-wmi.c b/drivers/misc/acer-wmi.c
index a4d677504250..d7aea93081f2 100644
--- a/drivers/misc/acer-wmi.c
+++ b/drivers/misc/acer-wmi.c
@@ -428,11 +428,9 @@ static acpi_status AMW0_set_u32(u32 value, u32 cap, struct wmi_interface *iface)
                 if (value > max_brightness)
                         return AE_BAD_PARAMETER;
                 switch (quirks->brightness) {
-                case 1:
-                        return ec_write(0x83, value);
                 default:
-                        return AE_BAD_ADDRESS;
-                break;
+                        return ec_write(0x83, value);
+                        break;
                 }
         default:
                 return AE_BAD_ADDRESS;