Merge git://git.iksaif.net/acpi4asus into x86-platform

2 files changed, 11 insertions, 11 deletions

diff --git a/Documentation/ABI/testing/sysfs-platform-asus-laptop b/Documentation/ABI/testing/sysfs-platform-asus-laptop
index a1cb660c50cf..1d775390e856 100644
--- a/Documentation/ABI/testing/sysfs-platform-asus-laptop
+++ b/Documentation/ABI/testing/sysfs-platform-asus-laptop
@@ -1,4 +1,4 @@
-What:           /sys/devices/platform/asus-laptop/display
+What:           /sys/devices/platform/asus_laptop/display
 Date:           January 2007
 KernelVersion:  2.6.20
 Contact:        "Corentin Chary" <corentincj@iksaif.net>
@@ -13,7 +13,7 @@ Description:
                 Ex: - 0 (0000b) means no display
                     - 3 (0011b) CRT+LCD.
 
-What:           /sys/devices/platform/asus-laptop/gps
+What:           /sys/devices/platform/asus_laptop/gps
 Date:           January 2007
 KernelVersion:  2.6.20
 Contact:        "Corentin Chary" <corentincj@iksaif.net>
@@ -21,7 +21,7 @@ Description:
                 Control the gps device. 1 means on, 0 means off.
 Users:          Lapsus
 
-What:           /sys/devices/platform/asus-laptop/ledd
+What:           /sys/devices/platform/asus_laptop/ledd
 Date:           January 2007
 KernelVersion:  2.6.20
 Contact:        "Corentin Chary" <corentincj@iksaif.net>
@@ -29,11 +29,11 @@ Description:
                 Some models like the W1N have a LED display that can be
                 used to display several informations.
                 To control the LED display, use the following :
-                    echo 0x0T000DDD > /sys/devices/platform/asus-laptop/
+                    echo 0x0T000DDD > /sys/devices/platform/asus_laptop/
                 where T control the 3 letters display, and DDD the 3 digits display.
                 The DDD table can be found in Documentation/laptops/asus-laptop.txt
 
-What:           /sys/devices/platform/asus-laptop/bluetooth
+What:           /sys/devices/platform/asus_laptop/bluetooth
 Date:           January 2007
 KernelVersion:  2.6.20
 Contact:        "Corentin Chary" <corentincj@iksaif.net>
@@ -42,7 +42,7 @@ Description:
                 This may control the led, the device or both.
 Users:          Lapsus
 
-What:           /sys/devices/platform/asus-laptop/wlan
+What:           /sys/devices/platform/asus_laptop/wlan
 Date:           January 2007
 KernelVersion:  2.6.20
 Contact:        "Corentin Chary" <corentincj@iksaif.net>
diff --git a/Documentation/ABI/testing/sysfs-platform-eeepc-laptop b/Documentation/ABI/testing/sysfs-platform-eeepc-laptop
index 7445dfb321b5..5b026c69587a 100644
--- a/Documentation/ABI/testing/sysfs-platform-eeepc-laptop
+++ b/Documentation/ABI/testing/sysfs-platform-eeepc-laptop
@@ -1,4 +1,4 @@
-What:           /sys/devices/platform/eeepc-laptop/disp
+What:           /sys/devices/platform/eeepc/disp
 Date:           May 2008
 KernelVersion:  2.6.26
 Contact:        "Corentin Chary" <corentincj@iksaif.net>
@@ -9,21 +9,21 @@ Description:
                 - 3 = LCD+CRT
                 If you run X11, you should use xrandr instead.
 
-What:           /sys/devices/platform/eeepc-laptop/camera
+What:           /sys/devices/platform/eeepc/camera
 Date:           May 2008
 KernelVersion:  2.6.26
 Contact:        "Corentin Chary" <corentincj@iksaif.net>
 Description:
                 Control the camera. 1 means on, 0 means off.
 
-What:           /sys/devices/platform/eeepc-laptop/cardr
+What:           /sys/devices/platform/eeepc/cardr
 Date:           May 2008
 KernelVersion:  2.6.26
 Contact:        "Corentin Chary" <corentincj@iksaif.net>
 Description:
                 Control the card reader. 1 means on, 0 means off.
 
-What:           /sys/devices/platform/eeepc-laptop/cpufv
+What:           /sys/devices/platform/eeepc/cpufv
 Date:           Jun 2009
 KernelVersion:  2.6.31
 Contact:        "Corentin Chary" <corentincj@iksaif.net>
@@ -42,7 +42,7 @@ Description:
                     `------------ Availables modes
                 For example, 0x301 means: mode 1 selected, 3 available modes.
 
-What:           /sys/devices/platform/eeepc-laptop/available_cpufv
+What:           /sys/devices/platform/eeepc/available_cpufv
 Date:           Jun 2009
 KernelVersion:  2.6.31
 Contact:        "Corentin Chary" <corentincj@iksaif.net>