diff options
author | Matthew C Campbell <calvinmc@gmail.com> | 2007-02-05 19:09:09 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-02-09 00:41:06 -0500 |
commit | 1c0f0575fd02a3996f09cac2ef29c4cc5c2d279d (patch) | |
tree | 686b7e605e6b1c14f6bacd182ef56c5068f631e1 /drivers/acpi | |
parent | c41458aca0defd5b16239ffd65630d1b87672ee5 (diff) |
ACPI: asus_acpi: Add support for Asus Z81SP
Adds support in asus_acpi for the Asus Z81SP laptop. This preserves all
old functionality when improperly detected as well as enabling Bluetooth
support.
Signed-off-by: Matthew C Campbell <calvinmc@gmail.com>
Acked-by: Corentin Chary <corentincj@iksaif.net>
Cc: Karol Kozimor <sziwan@users.sourceforge.net>
Cc: <acpi4asus-user@lists.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/asus_acpi.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c index 31ad70a6e22e..fa19a6c95501 100644 --- a/drivers/acpi/asus_acpi.c +++ b/drivers/acpi/asus_acpi.c | |||
@@ -141,6 +141,7 @@ struct asus_hotk { | |||
141 | W5A, //W5A | 141 | W5A, //W5A |
142 | W3V, //W3030V | 142 | W3V, //W3030V |
143 | xxN, //M2400N, M3700N, M5200N, M6800N, S1300N, S5200N | 143 | xxN, //M2400N, M3700N, M5200N, M6800N, S1300N, S5200N |
144 | A4S, //Z81sp | ||
144 | //(Centrino) | 145 | //(Centrino) |
145 | END_MODEL | 146 | END_MODEL |
146 | } model; //Models currently supported | 147 | } model; //Models currently supported |
@@ -397,7 +398,16 @@ static struct model_data model_conf[END_MODEL] = { | |||
397 | .brightness_set = "SPLV", | 398 | .brightness_set = "SPLV", |
398 | .brightness_get = "GPLV", | 399 | .brightness_get = "GPLV", |
399 | .display_set = "SDSP", | 400 | .display_set = "SDSP", |
400 | .display_get = "\\ADVG"} | 401 | .display_get = "\\ADVG"}, |
402 | |||
403 | { | ||
404 | .name = "A4S", | ||
405 | .brightness_set = "SPLV", | ||
406 | .brightness_get = "GPLV", | ||
407 | .mt_bt_switch = "BLED", | ||
408 | .mt_wled = "WLED" | ||
409 | } | ||
410 | |||
401 | }; | 411 | }; |
402 | 412 | ||
403 | /* procdir we use */ | 413 | /* procdir we use */ |
@@ -1117,6 +1127,8 @@ static int asus_model_match(char *model) | |||
1117 | return W3V; | 1127 | return W3V; |
1118 | else if (strncmp(model, "W5A", 3) == 0) | 1128 | else if (strncmp(model, "W5A", 3) == 0) |
1119 | return W5A; | 1129 | return W5A; |
1130 | else if (strncmp(model, "A4S", 3) == 0) | ||
1131 | return A4S; | ||
1120 | else | 1132 | else |
1121 | return END_MODEL; | 1133 | return END_MODEL; |
1122 | } | 1134 | } |