---

yaml
---
r: 243101
b: refs/heads/master
c: e12e6d9
h: refs/heads/master
i:
  243099: 3febd75
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b799d4fb787bb94f1068352220ab033ac7969f8
+refs/heads/master: e12e6d94db24e9050821965aa75c95e8d2c65f10

trunk/Documentation/ABI/testing/sysfs-platform-eeepc-wmi → trunk/Documentation/ABI/testing/sysfs-platform-asus-wmi

@@ -1,4 +1,4 @@
-What:		/sys/devices/platform/eeepc-wmi/cpufv
+What:		/sys/devices/platform/<platform>/cpufv
 Date:		Oct 2010
 KernelVersion:	2.6.37
 Contact:	"Corentin Chary" <corentincj@iksaif.net>
@@ -9,21 +9,21 @@ Description:
 		    * 1 -> High Performance Mode
 		    * 2 -> Power Saving Mode
 
-What:		/sys/devices/platform/eeepc-wmi/camera
+What:		/sys/devices/platform/<platform>/camera
 Date:		Jan 2010
 KernelVersion:	2.6.39
 Contact:	"Corentin Chary" <corentincj@iksaif.net>
 Description:
 		Control the camera. 1 means on, 0 means off.
 
-What:		/sys/devices/platform/eeepc-wmi/cardr
+What:		/sys/devices/platform/<platform>/cardr
 Date:		Jan 2010
 KernelVersion:	2.6.39
 Contact:	"Corentin Chary" <corentincj@iksaif.net>
 Description:
 		Control the card reader. 1 means on, 0 means off.
 
-What:		/sys/devices/platform/eeepc-wmi/touchpad
+What:		/sys/devices/platform/<platform>/touchpad
 Date:		Jan 2010
 KernelVersion:	2.6.39
 Contact:	"Corentin Chary" <corentincj@iksaif.net>

trunk/drivers/platform/x86/Kconfig

@@ -451,10 +451,11 @@ config EEEPC_LAPTOP
 	  Bluetooth, backlight and allows powering on/off some other
 	  devices.
 
-	  If you have an Eee PC laptop, say Y or M here.
+	  If you have an Eee PC laptop, say Y or M here. If this driver
+	  doesn't work on your Eee PC, try eeepc-wmi instead.
 
-config EEEPC_WMI
-	tristate "Eee PC WMI Hotkey Driver (EXPERIMENTAL)"
+config ASUS_WMI
+	tristate "ASUS WMI Driver (EXPERIMENTAL)"
 	depends on ACPI_WMI
 	depends on INPUT
 	depends on EXPERIMENTAL
@@ -464,10 +465,23 @@ config EEEPC_WMI
 	select LEDS_CLASS
 	select NEW_LEDS
 	---help---
-	  Say Y here if you want to support WMI-based hotkeys on Eee PC laptops.
+	  Say Y here if you have a WMI aware Asus laptop (like Eee PCs).
 
 	  To compile this driver as a module, choose M here: the module will
-	  be called eeepc-wmi.
+	  be called asus-wmi.
+
+config EEEPC_WMI
+	tristate "Eee PC WMI Driver (EXPERIMENTAL)"
+	depends on ASUS_WMI
+	---help---
+	  This is a driver for newer Eee PC laptops. It adds extra features
+	  like wireless radio and bluetooth control, leds, hotkeys, backlight...
+
+	  For more informations, see
+	  <file:Documentation/ABI/testing/sysfs-platform-asus-wmi>
+
+	  If you have an ACPI-WMI compatible Eee PC laptop (>= 1000), say Y or M
+	  here.
 
 config ACPI_WMI
 	tristate "WMI"

trunk/drivers/platform/x86/Makefile

@@ -3,8 +3,9 @@
 # x86 Platform-Specific Drivers
 #
 obj-$(CONFIG_ASUS_LAPTOP)	+= asus-laptop.o
+obj-$(CONFIG_ASUS_WMI)		+= asus-wmi.o
 obj-$(CONFIG_EEEPC_LAPTOP)	+= eeepc-laptop.o
-obj-$(CONFIG_EEEPC_WMI)		+= asus-wmi.o eeepc-wmi.o
+obj-$(CONFIG_EEEPC_WMI)		+= eeepc-wmi.o
 obj-$(CONFIG_MSI_LAPTOP)	+= msi-laptop.o
 obj-$(CONFIG_ACPI_CMPC)		+= classmate-laptop.o
 obj-$(CONFIG_COMPAL_LAPTOP)	+= compal-laptop.o