summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorKarol Kozimor <sziwan@hell.org.pl>2006-07-01 01:15:00 +0200
committerLen Brown <len.brown@intel.com>2006-07-01 02:38:10 +0200
commit2df8386cec47520b76822cb39d96709f5d353cf8 (patch)
tree54217637c4e2005a862d85d427249f5f3f382996 /drivers/acpi
parentACPI: asus_acpi: add S1N WLED control (diff)
downloadlinux-2df8386cec47520b76822cb39d96709f5d353cf8.tar.xz
linux-2df8386cec47520b76822cb39d96709f5d353cf8.zip
ACPI: asus_acpi: add S1N WLED control
This patch switches back the display nodes for M6R and M6N -- this happened a while ago when a patch was misapplied (only the in-tree version was affected). Signed-off-by: Karol Kozimor <sziwan@hell.org.pl> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/asus_acpi.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index d1ff387a58d6..e9ee4c52a5f6 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -310,7 +310,8 @@ static struct model_data model_conf[END_MODEL] = {
.brightness_set = "SPLV",
.brightness_get = "GPLV",
.display_set = "SDSP",
- .display_get = "\\_SB.PCI0.P0P1.VGA.GETD"},
+ .display_get = "\\SSTE"},
+
{
.name = "M6R",
.mt_mled = "MLED",
@@ -320,7 +321,7 @@ static struct model_data model_conf[END_MODEL] = {
.brightness_set = "SPLV",
.brightness_get = "GPLV",
.display_set = "SDSP",
- .display_get = "\\SSTE"},
+ .display_get = "\\_SB.PCI0.P0P1.VGA.GETD"},
{
.name = "P30",